X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Ftopology%2FTapiTopologyImpl.java;h=fc146e5f7004fd601103196be224f72d7fa3e404;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=9c4dfcf3e99d750af0098a64f101c1c6e13216c4;hpb=04b9194abd5955a6ce7334a25ee55aa18ed2e776;p=transportpce.git diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 9c4dfcf3e..fc146e5f7 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -9,12 +9,14 @@ package org.opendaylight.transportpce.tapi.topology; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; +import java.nio.charset.Charset; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; +import java.util.Map.Entry; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -25,15 +27,16 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.InstanceIdentifiers; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.Nodes; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.NodesKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mapping.MappingKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; @@ -44,13 +47,11 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Admi import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.LayerProtocolName; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.LifecycleState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.OperationalState; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.PortDirection; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.PortRole; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationDirection; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.TerminationState; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.Uuid; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.Name; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.ForwardingRule; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetLinkDetailsOutput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetNodeDetailsInput; @@ -62,14 +63,21 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.Ge import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsOutputBuilder; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyListInput; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyListOutput; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.RuleType; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.TapiTopologyService; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.topology.details.output.Topology; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.get.topology.details.output.TopologyBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.NodeRuleGroup; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.NodeRuleGroupBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.NodeRuleGroupKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePoint; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePointBuilder; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePoint; -import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.edge.point.MappedServiceInterfacePointBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.OwnedNodeEdgePointKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.Rule; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.RuleBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.RuleKey; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.LinkKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeBuilder; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -94,130 +102,139 @@ public class TapiTopologyImpl implements TapiTopologyService { @Override public ListenableFuture> getTopologyDetails(GetTopologyDetailsInput input) { - LOG.info("Building TAPI Topology absraction from {}", input.getTopologyIdOrName()); - Topology topology = null; - switch (input.getTopologyIdOrName()) { - case NetworkUtils.OVERLAY_NETWORK_ID: - topology = createAbstractedOpenroadmTopology(); - break; - case NetworkUtils.OTN_NETWORK_ID: - topology = createAbstractedOtnTopology(); - break; - default: - LOG.error("{} unknown - can not be abstracted", input.getTopologyIdOrName()); - break; + if (!TopologyUtils.T0_MULTILAYER.equals(input.getTopologyIdOrName()) + && !TopologyUtils.TPDR_100G.equals(input.getTopologyIdOrName())) { + LOG.error("Invalid TAPI topology name"); + return RpcResultBuilder.success(new GetTopologyDetailsOutputBuilder().build()).buildFuture(); } - if (topology != null) { + try { + LOG.info("Building TAPI Topology abstraction for {}", input.getTopologyIdOrName()); + Topology topology = createAbstractedOtnTopology(); + if (TopologyUtils.TPDR_100G.equals(input.getTopologyIdOrName())) { + topology = createAbstracted100GTpdrTopology(topology); + } return RpcResultBuilder.success(new GetTopologyDetailsOutputBuilder().setTopology(topology).build()) .buildFuture(); - } else { + } catch (TapiTopologyException e) { + LOG.error("error building TAPI topology"); return RpcResultBuilder.success(new GetTopologyDetailsOutputBuilder().build()).buildFuture(); } } - private Topology createAbstractedOpenroadmTopology() { - // read openroadm-topology - @NonNull - FluentFuture> openroadmTopoOpt = dataBroker.newReadOnlyTransaction().read( - LogicalDatastoreType.CONFIGURATION, InstanceIdentifiers.OVERLAY_NETWORK_II); - if (openroadmTopoOpt.isDone()) { - Network openroadmTopo = null; - try { - openroadmTopo = openroadmTopoOpt.get().get(); - } catch (InterruptedException | ExecutionException | NoSuchElementException e) { - LOG.error("Impossible to retreive openroadm-topology from mdsal"); - } - List nodeList = openroadmTopo.getNode(); - @Nullable - List linkList = openroadmTopo.augmentation(Network1.class).getLink(); - List xponderOutLinkList = linkList.stream().filter(lk -> lk.augmentation(Link1.class).getLinkType() - .equals(OpenroadmLinkType.XPONDEROUTPUT)).collect(Collectors.toList()); - List xponderInLinkList = linkList.stream().filter(lk -> lk.augmentation(Link1.class).getLinkType() - .equals(OpenroadmLinkType.XPONDERINPUT)).collect(Collectors.toList()); - - List xpdrNodeList = nodeList.stream().filter(nt -> nt.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class).getNodeType() - .equals(OpenroadmNodeType.XPONDER)).collect(Collectors.toList()); - Map> clientPortMap = new HashMap<>(); - for (Node node : xpdrNodeList) { - String nodeId = node.getSupportingNode().get(0).getNodeRef().getValue(); - List clientPortList = new ArrayList<>(); - for (TerminationPoint tp : node.augmentation(Node1.class).getTerminationPoint()) { - if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) { - if (checkTp(node.getNodeId().getValue(), nodeId, tp, xponderOutLinkList, xponderInLinkList)) { - clientPortList.add(tp.getTpId().getValue()); - } - } - } - if (!clientPortList.isEmpty()) { - clientPortMap.put(nodeId, clientPortList); - } - } - - List goodTpList = new ArrayList<>(); - for (Map.Entry> entry : clientPortMap.entrySet()) { - String key = entry.getKey(); - List value = entry.getValue(); - for (String tpid : value) { - goodTpList.add(key + "--" + tpid); - } - } + private Topology createAbstracted100GTpdrTopology(Topology topology) { + List dsrNodes + = topology.nonnullNode().values().stream() + .filter(node -> node.getLayerProtocolName().contains(LayerProtocolName.DSR)) + .collect(Collectors.toList()); + List nep100GTpdrList = new ArrayList<>(); + for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node2 : dsrNodes) { + List nepList = node2.getOwnedNodeEdgePoint().values().stream() + .filter(nep -> nep.getName().containsKey(new NameKey("100G-tpdr"))).collect(Collectors.toList()); + nep100GTpdrList.addAll(nepList); + } + Name topoName = new NameBuilder().setValue(TopologyUtils.TPDR_100G).setValueName("TAPI Topology Name").build(); + Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes(TopologyUtils.TPDR_100G.getBytes(Charset.forName("UTF-8"))) + .toString()); + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node + = createTapiNode(nep100GTpdrList, topoUuid); + return new TopologyBuilder() + .setName(Map.of(topoName.key(), topoName)) + .setUuid(topoUuid) + .setNode(Map.of(node.key(), node)) + .build(); + } - // tapi topology creation - List names = new ArrayList(); - names.add(new NameBuilder().setValue("topo ethernet").setValueName("Topo Name").build()); - Uuid uuid = new Uuid(UUID.randomUUID().toString()); - List tapiNodeList = - new ArrayList<>(); - tapiNodeList.add(createTapiNode(goodTpList)); - Topology topology = new TopologyBuilder().setName(names).setUuid(uuid).setNode(tapiNodeList).build(); - return topology; - } else { - return null; + private Network readTopology(InstanceIdentifier networkIID) + throws TapiTopologyException { + Network topology = null; + FluentFuture> topologyFuture = dataBroker.newReadOnlyTransaction() + .read(LogicalDatastoreType.CONFIGURATION, networkIID); + try { + topology = topologyFuture.get().get(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new TapiTopologyException("Unable to get from mdsal topology: " + networkIID + .firstKeyOf(Network.class).getNetworkId().getValue(), e); + } catch (ExecutionException e) { + throw new TapiTopologyException("Unable to get from mdsal topology: " + networkIID + .firstKeyOf(Network.class).getNetworkId().getValue(), e); } + return topology; } - private Topology createAbstractedOtnTopology() { + private Topology createAbstractedOtnTopology() throws TapiTopologyException { + // read openroadm-topology + Network openroadmTopo = readTopology(InstanceIdentifiers.OVERLAY_NETWORK_II); + List linkList = new ArrayList<>(); + if (openroadmTopo.augmentation(Network1.class) != null) { + linkList.addAll(openroadmTopo.augmentation(Network1.class).getLink().values()); + } + List xponderOutLinkList = linkList.stream() + .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDEROUTPUT)) + .collect(Collectors.toList()); + List xponderInLinkList = linkList.stream() + .filter(lk -> lk.augmentation(Link1.class).getLinkType().equals(OpenroadmLinkType.XPONDERINPUT)) + .collect(Collectors.toList()); // read otn-topology - @NonNull - FluentFuture> otnTopoOpt = dataBroker.newReadOnlyTransaction().read( - LogicalDatastoreType.CONFIGURATION, InstanceIdentifiers.OTN_NETWORK_II); - if (otnTopoOpt.isDone()) { - Network otnTopo = null; - try { - otnTopo = otnTopoOpt.get().get(); - } catch (InterruptedException | ExecutionException | NoSuchElementException e) { - LOG.error("Impossible to retreive otn-topology from mdsal"); - return null; + Network otnTopo = readTopology(InstanceIdentifiers.OTN_NETWORK_II); + Map otnNodeMap = otnTopo.nonnullNode().values().stream() + .collect(Collectors.toMap(Node::getNodeId, node -> node)); + + Map> networkPortMap = new HashMap<>(); + Iterator> itOtnNodeMap = otnNodeMap.entrySet().iterator(); + while (itOtnNodeMap.hasNext()) { + Entry entry = itOtnNodeMap.next(); + String portMappingNodeId = entry.getValue().getSupportingNode().values().stream() + .filter(sn -> sn.getNetworkRef().getValue().equals(NetworkUtils.UNDERLAY_NETWORK_ID)) + .findFirst() + .get().getNodeRef().getValue(); + List networkPortList = new ArrayList<>(); + for (TerminationPoint tp : entry.getValue().augmentation(Node1.class).getTerminationPoint().values()) { + if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERNETWORK) + && + checkTp(entry.getKey().getValue(), portMappingNodeId, tp, xponderOutLinkList, xponderInLinkList)) { + networkPortList.add(tp.getTpId().getValue()); + } } - List nodeList = otnTopo.getNode(); - List otnNodeList = nodeList.stream().filter(nt -> nt.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class) - .getNodeType().equals(OpenroadmNodeType.SWITCH) || nt.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class) - .getNodeType().equals(OpenroadmNodeType.MUXPDR)).collect(Collectors.toList()); - List tapiNodeList = - new ArrayList<>(); - List tapiLinkList = - new ArrayList<>(); - Uuid topoUuid = new Uuid(UUID.randomUUID().toString()); - for (Node node : otnNodeList) { - ConvertORTopoObjectToTapiTopoObject tapiFactory = - new ConvertORTopoObjectToTapiTopoObject(node, null, topoUuid); - tapiFactory.convertNode(); - tapiNodeList.addAll(tapiFactory.getTapiNodes()); - tapiLinkList.addAll(tapiFactory.getTapiLinks()); + if (!networkPortList.isEmpty()) { + networkPortMap.put(entry.getKey().getValue(), networkPortList); } - Topology topology = new TopologyBuilder() - .setName(Arrays.asList(new NameBuilder().setValue("T0 - Multi-layer topology") - .setValueName("TAPI Topology Name").build())) + } + Map + tapiNodeList = new HashMap<>(); + Map + tapiLinkList = new HashMap<>(); + Uuid topoUuid = new Uuid(UUID.nameUUIDFromBytes(TopologyUtils.T0_MULTILAYER.getBytes(Charset.forName("UTF-8"))) + .toString()); + ConvertORTopoToTapiTopo tapiFactory = new ConvertORTopoToTapiTopo(topoUuid); + Iterator>> it = networkPortMap.entrySet().iterator(); + while (it.hasNext()) { + String nodeId = it.next().getKey(); + tapiFactory.convertNode(otnNodeMap.get(new NodeId(nodeId)), networkPortMap.get(nodeId)); + tapiNodeList.putAll(tapiFactory.getTapiNodes()); + tapiLinkList.putAll(tapiFactory.getTapiLinks()); + } + if (openroadmTopo.nonnullNode().values().stream().filter(nt -> + nt.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1.class) + .getNodeType().equals(OpenroadmNodeType.SRG)).count() > 0) { + tapiFactory.convertRoadmInfrastructure(); + tapiNodeList.putAll(tapiFactory.getTapiNodes()); + tapiLinkList.putAll(tapiFactory.getTapiLinks()); + } else { + LOG.warn("Unable to abstract an ROADM infrasctructure from openroadm-topology"); + } + if (otnTopo.augmentation(Network1.class) != null) { + Map otnLinkMap = otnTopo.augmentation(Network1.class).getLink(); + tapiFactory.convertLinks(otnLinkMap); + tapiLinkList.putAll(tapiFactory.getTapiLinks()); + } + Name name = new NameBuilder().setValue(TopologyUtils.T0_MULTILAYER).setValueName("TAPI Topology Name").build(); + return new TopologyBuilder() + .setName(Map.of(name.key(), name)) .setUuid(topoUuid) .setNode(tapiNodeList) .setLink(tapiLinkList).build(); - return topology; - } else { - return null; - } } @Override @@ -239,52 +256,39 @@ public class TapiTopologyImpl implements TapiTopologyService { return null; } - private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node createTapiNode(List< - String> tpList) { - List names = new ArrayList(); - Name name = new NameBuilder().setValueName("node name").setValue("TapiNode1").build(); - names.add(name); - List layerProtocols = new ArrayList<>(); - layerProtocols.add(LayerProtocolName.ETH); - List onepl = new ArrayList(); - for (int i = 0; i < tpList.size(); i++) { - List onedNames = new ArrayList(); - onedNames.add(new NameBuilder().setValueName("OwnedNodeEdgePoint " + i).setValue(tpList.get(i)).build()); - OwnedNodeEdgePoint onep = new OwnedNodeEdgePointBuilder().setUuid(new Uuid(UUID.randomUUID().toString())) - .setLayerProtocolName(LayerProtocolName.ETH).setMappedServiceInterfacePoint(createSIP(1)) - .setLinkPortDirection(PortDirection.BIDIRECTIONAL).setLinkPortRole(PortRole.SYMMETRIC) - .setAdministrativeState(AdministrativeState.UNLOCKED).setOperationalState(OperationalState.ENABLED) - .setLifecycleState(LifecycleState.INSTALLED).setName(onedNames).setTerminationDirection( - TerminationDirection.BIDIRECTIONAL).setTerminationState(TerminationState.TERMINATEDBIDIRECTIONAL) - .build(); - onepl.add(onep); + private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node + createTapiNode(List nepList, Uuid topoUuid) { + Name name = new NameBuilder().setValueName("Tpdr100g node name").setValue("Tpdr100g over WDM node").build(); + Map onepMap = new HashMap<>(); + for (OwnedNodeEdgePoint ownedNodeEdgePoint : nepList) { + onepMap.put(ownedNodeEdgePoint.key(), ownedNodeEdgePoint); } - org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node = new NodeBuilder() - .setUuid(new Uuid(UUID.randomUUID().toString())).setName(names).setLayerProtocolName(layerProtocols) - .setAdministrativeState(AdministrativeState.UNLOCKED).setOperationalState(OperationalState.ENABLED) - .setLifecycleState(LifecycleState.INSTALLED).setOwnedNodeEdgePoint(onepl).build(); - return node; - } - - private List createSIP(int nb) { - List msipl = new ArrayList<>(); - for (int i = 0; i < nb; i++) { - MappedServiceInterfacePoint msip = new MappedServiceInterfacePointBuilder().setServiceInterfacePointUuid( - new Uuid(UUID.randomUUID().toString())).build(); - msipl.add(msip); - } - return msipl; + Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes(name.getValue().getBytes(Charset.forName("UTF-8"))).toString()); + return new NodeBuilder() + .setUuid(nodeUuid) + .setName(Map.of(name.key(), name)) + .setLayerProtocolName(List.of(LayerProtocolName.ETH)) + .setAdministrativeState(AdministrativeState.UNLOCKED) + .setOperationalState(OperationalState.ENABLED) + .setLifecycleState(LifecycleState.INSTALLED) + .setOwnedNodeEdgePoint(onepMap) + .setNodeRuleGroup(createNodeRuleGroupFor100gTpdrNode(topoUuid, nodeUuid, nepList)) + .build(); } private boolean checkTp(String nodeIdTopo, String nodeIdPortMap, TerminationPoint tp, List xpdOut, List< Link> xpdIn) { - @Nullable - String networkLcp = tp.augmentation( - org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.TerminationPoint1.class) - .getAssociatedConnectionMapPort(); + String networkLcp; + if (tp.augmentation(TerminationPoint1.class).getTpType().equals(OpenroadmTpType.XPONDERCLIENT)) { + networkLcp = tp.augmentation( + org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1.class) + .getAssociatedConnectionMapPort(); + } else { + networkLcp = tp.getTpId().getValue(); + } @NonNull KeyedInstanceIdentifier pmIID = InstanceIdentifier.create( - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.Network.class) + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.Network.class) .child(Nodes.class, new NodesKey(nodeIdPortMap)).child(Mapping.class, new MappingKey(networkLcp)); @NonNull FluentFuture> mappingOpt = dataBroker.newReadOnlyTransaction().read( @@ -294,7 +298,7 @@ public class TapiTopologyImpl implements TapiTopologyService { try { mapping = mappingOpt.get().get(); } catch (InterruptedException | ExecutionException e) { - LOG.error("Error getting mapping for {}", networkLcp); + LOG.error("Error getting mapping for {}", networkLcp,e); return false; } } else { @@ -310,11 +314,7 @@ public class TapiTopologyImpl implements TapiTopologyService { .getSource().getSourceTp().equals(networkLcp)).count(); count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo) && lk.getDestination().getDestTp().equals(networkLcp)).count(); - if (count == 2) { - return true; - } else { - return false; - } + return (count == 2); case "tx": case "rx": @Nullable @@ -331,15 +331,43 @@ public class TapiTopologyImpl implements TapiTopologyService { count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo) && lk.getSource().getSourceTp().equals(partnerLcp)).count(); } - if (count == 2) { - return true; - } else { - return false; - } + return (count == 2); default: LOG.error("Invalid port direction for {}", networkLcp); return false; } } + private Map createNodeRuleGroupFor100gTpdrNode(Uuid topoUuid, Uuid nodeUuid, + Collection onepl) { + Map + nepMap = new HashMap<>(); + for (OwnedNodeEdgePoint onep : onepl) { + org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint + nep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group + .NodeEdgePointBuilder() + .setTopologyUuid(topoUuid) + .setNodeUuid(nodeUuid) + .setNodeEdgePointUuid(onep.key().getUuid()) + .build(); + nepMap.put(nep.key(), nep); + } + Map nodeRuleGroupMap = new HashMap<>(); + Map ruleList = new HashMap<>(); + Rule rule = new RuleBuilder() + .setLocalId("forward") + .setForwardingRule(ForwardingRule.MAYFORWARDACROSSGROUP) + .setRuleType(RuleType.FORWARDING) + .build(); + ruleList.put(rule.key(), rule); + NodeRuleGroup nodeRuleGroup = new NodeRuleGroupBuilder() + .setUuid(new Uuid(UUID.nameUUIDFromBytes(("rdm infra node rule group").getBytes(Charset.forName("UTF-8"))) + .toString())) + .setRule(ruleList) + .setNodeEdgePoint(nepMap) + .build(); + nodeRuleGroupMap.put(nodeRuleGroup.key(), nodeRuleGroup); + return nodeRuleGroupMap; + } }