*/
package org.opendaylight.transportpce.tapi.topology;
-import java.math.BigInteger;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
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.capacity.TotalSizeBuilder;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.capacity.pac.AvailableCapacityBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.capacity.pac.TotalPotentialCapacityBuilder;
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.dsr.rev181210.DIGITALSIGNALTYPE100GigE;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E;
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.link.NodeEdgePoint;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.link.NodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.link.NodeEdgePointKey;
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.OwnedNodeEdgePointKey;
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.edge.point.MappedServiceInterfacePointKey;
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.Link;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.LinkBuilder;
+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.common.Uint64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
public class ConvertORTopoObjectToTapiTopoObject {
+ private static final String DSR = "DSR";
+ private static final String OTSI = "OTSi";
+ private static final String E_OTSI = "eOTSi";
+ private static final String I_OTSI = "iOTSi";
private static final Logger LOG = LoggerFactory.getLogger(ConvertORTopoObjectToTapiTopoObject.class);
private String ietfNodeId;
private List<TerminationPoint> oorClientPortList;
private List<TerminationPoint> oorNetworkPortList;
private OduSwitchingPools oorOduSwitchingPool;
private Uuid tapiTopoUuid;
- private List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node> tapiNodes;
- private List<Link> tapiLinks;
+ private Map<NodeKey, org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node>
+ tapiNodes;
+ private Map<LinkKey, Link> tapiLinks;
private Map<String, Uuid> uuidMap;
- public ConvertORTopoObjectToTapiTopoObject(Node ietfNode, Link1 otnLink, Uuid tapiTopoUuid) {
+
+ public ConvertORTopoObjectToTapiTopoObject(Uuid tapiTopoUuid) {
+ this.tapiTopoUuid = tapiTopoUuid;
+ this.tapiNodes = new HashMap<>();
+ this.tapiLinks = new HashMap<>();
+ this.uuidMap = new HashMap<>();
+ }
+
+ public void convertNode(Node ietfNode) {
this.ietfNodeId = ietfNode.getNodeId().getValue();
- this.oorClientPortList = ietfNode.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
- .network.topology.rev180226.Node1.class).getTerminationPoint().stream()
+ this.oorClientPortList = ietfNode.augmentation(
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class)
+ .getTerminationPoint().values().stream()
.filter(tp -> tp.augmentation(TerminationPoint1.class).getTpType().getIntValue()
== OpenroadmTpType.XPONDERCLIENT.getIntValue())
.sorted((tp1, tp2) -> tp1.getTpId().getValue().compareTo(tp2.getTpId().getValue()))
.collect(Collectors.toList());
- this.oorNetworkPortList = ietfNode.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
- .network.topology.rev180226.Node1.class).getTerminationPoint().stream()
+ this.oorNetworkPortList = ietfNode.augmentation(
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class)
+ .getTerminationPoint().values().stream()
.filter(tp -> tp.augmentation(TerminationPoint1.class).getTpType().getIntValue()
== OpenroadmTpType.XPONDERNETWORK.getIntValue())
.sorted((tp1, tp2) -> tp1.getTpId().getValue().compareTo(tp2.getTpId().getValue()))
.collect(Collectors.toList());
- this.oorOduSwitchingPool = ietfNode.augmentation(Node1.class).getSwitchingPools().getOduSwitchingPools().get(0);
- this.tapiTopoUuid = tapiTopoUuid;
- this.tapiNodes = new ArrayList<>();
- this.tapiLinks = new ArrayList<>();
- this.uuidMap = new HashMap<>();
- }
+ this.oorOduSwitchingPool = ietfNode.augmentation(Node1.class).getSwitchingPools().getOduSwitchingPools()
+ .values().stream().findFirst().get();
-
- public void convertNode() {
- //node creation [DSR/ODU]
+ // node creation [DSR/ODU]
LOG.info("creation of a DSR/ODU node");
- Uuid nodeUuid = new Uuid(UUID.randomUUID().toString());
- this.uuidMap.put(this.ietfNodeId + "+DSR", nodeUuid);
- List<Name> dsrNodeNames = Arrays.asList(new NameBuilder().setValueName("dsr/odu node name")
- .setValue(this.ietfNodeId).build());
+ Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes((String.join("+", this.ietfNodeId, DSR))
+ .getBytes(Charset.forName("UTF-8"))).toString());
+ this.uuidMap.put(String.join("+", this.ietfNodeId, DSR), nodeUuid);
+ Name nameDsr = new NameBuilder().setValueName("dsr/odu node name").setValue(this.ietfNodeId).build();
List<LayerProtocolName> dsrLayerProtocols = Arrays.asList(LayerProtocolName.DSR, LayerProtocolName.ODU);
org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology
- .Node dsrNode = createTapiNode(dsrNodeNames, dsrLayerProtocols);
- tapiNodes.add(dsrNode);
+ .Node dsrNode = createTapiNode(Map.of(nameDsr.key(), nameDsr), dsrLayerProtocols);
+ tapiNodes.put(dsrNode.key(), dsrNode);
- //node creation [otsi]
+ // node creation [otsi]
LOG.info("creation of an OTSi node");
- nodeUuid = new Uuid(UUID.randomUUID().toString());
- this.uuidMap.put(this.ietfNodeId + "+OTSi", nodeUuid);
- List<Name> otsiNodeNames = Arrays.asList(new NameBuilder().setValueName("otsi node name")
- .setValue(this.ietfNodeId).build());
+ nodeUuid = new Uuid(UUID.nameUUIDFromBytes((String.join("+", this.ietfNodeId, OTSI))
+ .getBytes(Charset.forName("UTF-8"))).toString());
+ this.uuidMap.put(String.join("+", this.ietfNodeId, OTSI), nodeUuid);
+ Name nameOtsi = new NameBuilder().setValueName("otsi node name").setValue(this.ietfNodeId).build();
List<LayerProtocolName> otsiLayerProtocols = Arrays.asList(LayerProtocolName.PHOTONICMEDIA);
org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology
- .Node otsiNode = createTapiNode(otsiNodeNames, otsiLayerProtocols);
- tapiNodes.add(otsiNode);
+ .Node otsiNode = createTapiNode(Map.of(nameOtsi.key(), nameOtsi), otsiLayerProtocols);
+ tapiNodes.put(otsiNode.key(), otsiNode);
- //transitional link cration between network nep of DSR/ODU node and iNep of otsi node
+ // transitional link cration between network nep of DSR/ODU node and iNep of otsi node
LOG.info("creation of transitional links between DSR/ODU and OTSi nodes");
createTapiTransitionalLinks();
}
+ public void convertLinks(List
+ <org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link>
+ otnLinkList) {
+ List<String> linksToNotConvert = new ArrayList<>();
+ LOG.info("creation of {} otn links", otnLinkList.size() / 2);
+ for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network
+ .Link link : otnLinkList) {
+ if (!linksToNotConvert.contains(link.getLinkId().getValue())) {
+ Link tapiLink = createTapiLink(link);
+ linksToNotConvert.add(link
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class)
+ .getOppositeLink().getValue());
+ tapiLinks.put(tapiLink.key(), tapiLink);
+ }
+ }
+ }
+
private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology
- .Node createTapiNode(List<Name> nodeNames, List<LayerProtocolName> layerProtocols) {
+ .Node createTapiNode(Map<NameKey, Name> nodeNames, List<LayerProtocolName> layerProtocols) {
Uuid nodeUuid = null;
- List<OwnedNodeEdgePoint> onepl = new ArrayList<>();
- List<NodeRuleGroup> nodeRuleGroupList = new ArrayList<>();
- List<Rule> ruleList = new ArrayList<>();
+ Map<OwnedNodeEdgePointKey, OwnedNodeEdgePoint> onepl = new HashMap<>();
+ Map<NodeRuleGroupKey, NodeRuleGroup> nodeRuleGroupList = new HashMap<>();
+ Map<RuleKey, Rule> ruleList = new HashMap<>();
Rule rule = new RuleBuilder()
.setLocalId("forward")
.setForwardingRule(ForwardingRule.MAYFORWARDACROSSGROUP)
.setRuleType(RuleType.FORWARDING)
.build();
- ruleList.add(rule);
+ ruleList.put(rule.key(), rule);
if (layerProtocols.contains(LayerProtocolName.DSR)) {
- nodeUuid = this.uuidMap.get(this.ietfNodeId + "+DSR");
- // client nep creation on DSR/ODU node
- for (int i = 0; i < oorClientPortList.size(); i++) {
- Uuid nepUuid = new Uuid(UUID.randomUUID().toString());
- this.uuidMap.put("DSR+" + oorClientPortList.get(i).getTpId().getValue(), nepUuid);
- List<Name> onedNames = Arrays.asList(new NameBuilder().setValueName(new StringBuilder("NodeEdgePoint_C")
- .append(i + 1).toString()).setValue(oorClientPortList.get(i).getTpId().getValue()).build());
- OwnedNodeEdgePoint onep = createNep(oorClientPortList.get(i), onedNames, LayerProtocolName.ETH,
- LayerProtocolName.DSR, true, "DSR+");
- onepl.add(onep);
- }
- // network nep creation on DSR/ODU node
- for (int i = 0; i < oorNetworkPortList.size(); i++) {
- Uuid nepUuid = new Uuid(UUID.randomUUID().toString());
- this.uuidMap.put("DSR+" + oorNetworkPortList.get(i).getTpId().getValue(), nepUuid);
- List<Name> onedNames = Arrays.asList(new NameBuilder().setValueName(new StringBuilder("NodeEdgePoint_N")
- .append(i + 1).toString()).setValue(oorNetworkPortList.get(i).getTpId().getValue()).build());
- OwnedNodeEdgePoint onep = createNep(oorNetworkPortList.get(i), onedNames, LayerProtocolName.ODU,
- LayerProtocolName.DSR, true, "DSR+");
- onepl.add(onep);
- }
- // create NodeRuleGroup
- for (NonBlockingList nbl : this.oorOduSwitchingPool.getNonBlockingList()) {
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group
- .NodeEdgePoint> nepList = new ArrayList<>();
- for (TpId tp : nbl.getTpList()) {
- 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(tapiTopoUuid)
- .setNodeUuid(this.uuidMap.get(this.ietfNodeId + "+DSR"))
- .setNodeEdgePointUuid(this.uuidMap.get("DSR+" + tp.getValue()))
- .build();
- nepList.add(nep);
- }
- NodeRuleGroup nodeRuleGroup = new NodeRuleGroupBuilder()
- .setUuid(new Uuid(UUID.randomUUID().toString()))
- .setRule(ruleList)
- .setNodeEdgePoint(nepList)
- .build();
- nodeRuleGroupList.add(nodeRuleGroup);
- }
+ nodeUuid = getNodeUuid4Dsr(onepl, nodeRuleGroupList, ruleList);
} else if (layerProtocols.contains(LayerProtocolName.PHOTONICMEDIA)) {
- nodeUuid = this.uuidMap.get(this.ietfNodeId + "+OTSi");
- // iNep creation on otsi node
- for (int i = 0; i < oorNetworkPortList.size(); i++) {
- Uuid nepUuid1 = new Uuid(UUID.randomUUID().toString());
- this.uuidMap.put("iOTSi+" + oorNetworkPortList.get(i).getTpId().getValue(), nepUuid1);
- List<Name> onedNames = Arrays.asList(new NameBuilder().setValueName(new StringBuilder("iNodeEdgePoint_")
- .append(i + 1).toString()).setValue(oorNetworkPortList.get(i).getTpId().getValue()).build());
- OwnedNodeEdgePoint onep = createNep(oorNetworkPortList.get(i), onedNames,
- LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, true, "iOTSi+");
- onepl.add(onep);
- }
- // eNep creation on otsi node
- for (int i = 0; i < oorNetworkPortList.size(); i++) {
- Uuid nepUuid2 = new Uuid(UUID.randomUUID().toString());
- this.uuidMap.put("eOTSi+" + oorNetworkPortList.get(i).getTpId().getValue(), nepUuid2);
- List<Name> onedNames = Arrays.asList(new NameBuilder().setValueName(new StringBuilder("eNodeEdgePoint_")
- .append(i + 1).toString()).setValue(oorNetworkPortList.get(i).getTpId().getValue()).build());
- OwnedNodeEdgePoint onep = createNep(oorNetworkPortList.get(i), onedNames,
- LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, true, "eOTSi+");
- onepl.add(onep);
- }
- // create NodeRuleGroup
- for (TerminationPoint tp : this.oorNetworkPortList) {
- List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group
- .NodeEdgePoint> nepList = new ArrayList<>();
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group
- .NodeEdgePoint inep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210
- .node.rule.group.NodeEdgePointBuilder()
- .setTopologyUuid(tapiTopoUuid)
- .setNodeUuid(this.uuidMap.get(this.ietfNodeId + "+OTSi"))
- .setNodeEdgePointUuid(this.uuidMap.get("iOTSi+" + tp.getTpId().getValue()))
- .build();
+ nodeUuid = getNodeUuid4Phonic(onepl, nodeRuleGroupList, ruleList);
+ } else {
+ LOG.error("Undefined LayerProtocolName for {} node {}", nodeNames.get(nodeNames.keySet().iterator().next())
+ .getValueName(), nodeNames.get(nodeNames.keySet().iterator().next()).getValue());
+ }
+
+ // create tapi node
+
+ return new NodeBuilder()
+ .setUuid(nodeUuid)
+ .setName(nodeNames)
+ .setLayerProtocolName(layerProtocols)
+ .setAdministrativeState(AdministrativeState.UNLOCKED)
+ .setOperationalState(OperationalState.ENABLED)
+ .setLifecycleState(LifecycleState.INSTALLED)
+ .setOwnedNodeEdgePoint(onepl)
+ .setNodeRuleGroup(nodeRuleGroupList)
+ .build();
+ }
+
+ private Uuid getNodeUuid4Phonic(Map<OwnedNodeEdgePointKey, OwnedNodeEdgePoint> onepl,
+ Map<NodeRuleGroupKey, NodeRuleGroup> nodeRuleGroupList, Map<RuleKey, Rule> ruleList) {
+ Uuid nodeUuid;
+ nodeUuid = this.uuidMap.get(String.join("+", this.ietfNodeId, OTSI));
+ // iNep creation on otsi node
+ for (int i = 0; i < oorNetworkPortList.size(); i++) {
+ Uuid nepUuid1 = new Uuid(UUID.nameUUIDFromBytes(
+ (String.join("+", this.ietfNodeId, I_OTSI, oorNetworkPortList.get(i).getTpId().getValue()))
+ .getBytes(Charset.forName("UTF-8")))
+ .toString());
+ this.uuidMap.put(String.join("+", this.ietfNodeId, I_OTSI, oorNetworkPortList.get(i).getTpId().getValue()),
+ nepUuid1);
+ Name onedName = new NameBuilder()
+ .setValueName(new StringBuilder("iNodeEdgePoint_").append(i + 1).toString())
+ .setValue(oorNetworkPortList.get(i).getTpId().getValue())
+ .build();
+
+ OwnedNodeEdgePoint onep = createNep(oorNetworkPortList.get(i), Map.of(onedName.key(), onedName),
+ LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, true,
+ String.join("+", this.ietfNodeId, I_OTSI));
+ onepl.put(onep.key(), onep);
+ }
+ // eNep creation on otsi node
+ for (int i = 0; i < oorNetworkPortList.size(); i++) {
+ Uuid nepUuid2 = new Uuid(UUID.nameUUIDFromBytes(
+ (String.join("+", this.ietfNodeId, E_OTSI, oorNetworkPortList.get(i).getTpId().getValue()))
+ .getBytes(Charset.forName("UTF-8")))
+ .toString());
+ this.uuidMap.put(String.join("+", this.ietfNodeId, E_OTSI, oorNetworkPortList.get(i).getTpId().getValue()),
+ nepUuid2);
+ Name onedName = new NameBuilder()
+ .setValueName(new StringBuilder("eNodeEdgePoint_").append(i + 1).toString())
+ .setValue(oorNetworkPortList.get(i).getTpId().getValue())
+ .build();
+
+ OwnedNodeEdgePoint onep = createNep(oorNetworkPortList.get(i), Map.of(onedName.key(), onedName),
+ LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, true,
+ String.join("+", this.ietfNodeId, E_OTSI));
+ onepl.put(onep.key(), onep);
+ }
+ // create NodeRuleGroup
+ int count = 1;
+ for (TerminationPoint tp : this.oorNetworkPortList) {
+ Map<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePointKey,
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint>
+ nepList = new HashMap<>();
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group
+ .NodeEdgePoint inep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210
+ .node.rule.group.NodeEdgePointBuilder()
+ .setTopologyUuid(tapiTopoUuid)
+ .setNodeUuid(this.uuidMap.get(String.join("+", this.ietfNodeId, OTSI)))
+ .setNodeEdgePointUuid(
+ this.uuidMap.get(String.join("+", this.ietfNodeId, I_OTSI, tp.getTpId().getValue())))
+ .build();
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group
+ .NodeEdgePoint enep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210
+ .node.rule.group.NodeEdgePointBuilder()
+ .setTopologyUuid(tapiTopoUuid)
+ .setNodeUuid(this.uuidMap.get(String.join("+", this.ietfNodeId, OTSI)))
+ .setNodeEdgePointUuid(
+ this.uuidMap.get(String.join("+", this.ietfNodeId, E_OTSI, tp.getTpId().getValue())))
+ .build();
+ nepList.put(inep.key(), inep);
+ nepList.put(enep.key(), enep);
+ NodeRuleGroup nodeRuleGroup = new NodeRuleGroupBuilder()
+ .setUuid(new Uuid(
+ UUID.nameUUIDFromBytes(("otsi node rule group " + count).getBytes(Charset.forName("UTF-8")))
+ .toString()))
+ .setRule(ruleList)
+ .setNodeEdgePoint(nepList)
+ .build();
+ nodeRuleGroupList.put(nodeRuleGroup.key(), nodeRuleGroup);
+ count++;
+ }
+ return nodeUuid;
+ }
+
+ private Uuid getNodeUuid4Dsr(Map<OwnedNodeEdgePointKey, OwnedNodeEdgePoint> onepl,
+ Map<NodeRuleGroupKey, NodeRuleGroup> nodeRuleGroupList, Map<RuleKey, Rule> ruleList) {
+ Uuid nodeUuid;
+ nodeUuid = this.uuidMap.get(String.join("+", this.ietfNodeId, DSR));
+ // client nep creation on DSR/ODU node
+ for (int i = 0; i < oorClientPortList.size(); i++) {
+ Uuid nepUuid = new Uuid(UUID.nameUUIDFromBytes(
+ (String.join("+", this.ietfNodeId, DSR, oorClientPortList.get(i).getTpId().getValue()))
+ .getBytes(Charset.forName("UTF-8"))).toString());
+ this.uuidMap.put(String.join("+", this.ietfNodeId, DSR, oorClientPortList.get(i).getTpId().getValue()),
+ nepUuid);
+ Name name = new NameBuilder()
+ .setValueName(new StringBuilder("NodeEdgePoint_C").append(i + 1).toString())
+ .setValue(oorClientPortList.get(i).getTpId().getValue())
+ .build();
+
+ OwnedNodeEdgePoint onep = createNep(oorClientPortList.get(i), Map.of(name.key(), name),
+ LayerProtocolName.ETH, LayerProtocolName.DSR, true, String.join("+", this.ietfNodeId, DSR));
+ onepl.put(onep.key(), onep);
+ }
+ // network nep creation on DSR/ODU node
+ for (int i = 0; i < oorNetworkPortList.size(); i++) {
+ Uuid nepUuid = new Uuid(UUID.nameUUIDFromBytes(
+ (String.join("+", this.ietfNodeId, DSR, oorNetworkPortList.get(i).getTpId().getValue()))
+ .getBytes(Charset.forName("UTF-8"))).toString());
+ this.uuidMap.put(String.join("+", this.ietfNodeId, DSR, oorNetworkPortList.get(i).getTpId().getValue()),
+ nepUuid);
+ Name onedName = new NameBuilder()
+ .setValueName(new StringBuilder("NodeEdgePoint_N").append(i + 1).toString())
+ .setValue(oorNetworkPortList.get(i).getTpId().getValue())
+ .build();
+
+ OwnedNodeEdgePoint onep = createNep(oorNetworkPortList.get(i), Map.of(onedName.key(), onedName),
+ LayerProtocolName.ODU, LayerProtocolName.DSR, true, String.join("+", this.ietfNodeId, DSR));
+ onepl.put(onep.key(), onep);
+ }
+ // create NodeRuleGroup
+ int count = 1;
+ for (NonBlockingList nbl : this.oorOduSwitchingPool.getNonBlockingList().values()) {
+ Map<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePointKey,
+ org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group.NodeEdgePoint>
+ nepList = new HashMap<>();
+ for (TpId tp : nbl.getTpList()) {
org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.node.rule.group
- .NodeEdgePoint enep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210
+ .NodeEdgePoint nep = new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210
.node.rule.group.NodeEdgePointBuilder()
.setTopologyUuid(tapiTopoUuid)
- .setNodeUuid(this.uuidMap.get(this.ietfNodeId + "+OTSi"))
- .setNodeEdgePointUuid(this.uuidMap.get("eOTSi+" + tp.getTpId().getValue()))
- .build();
- nepList.add(inep);
- nepList.add(enep);
- NodeRuleGroup nodeRuleGroup = new NodeRuleGroupBuilder()
- .setUuid(new Uuid(UUID.randomUUID().toString()))
- .setRule(ruleList)
- .setNodeEdgePoint(nepList)
+ .setNodeUuid(this.uuidMap.get(String.join("+", this.ietfNodeId, DSR)))
+ .setNodeEdgePointUuid(this.uuidMap.get(String.join("+", this.ietfNodeId, DSR, tp.getValue())))
.build();
- nodeRuleGroupList.add(nodeRuleGroup);
+ nepList.put(nep.key(), nep);
}
- } else {
- LOG.error("Undefined LayerProtocolName for {} node {}", nodeNames.get(0).getValueName(), nodeNames.get(0)
- .getValue());
+ NodeRuleGroup nodeRuleGroup = new NodeRuleGroupBuilder()
+ .setUuid(new Uuid(
+ UUID.nameUUIDFromBytes(("dsr node rule group " + count).getBytes(Charset.forName("UTF-8")))
+ .toString()))
+ .setRule(ruleList)
+ .setNodeEdgePoint(nepList)
+ .build();
+ nodeRuleGroupList.put(nodeRuleGroup.key(), nodeRuleGroup);
+ count++;
}
-
- // create tapi node
- org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node tapiNode =
- new NodeBuilder()
- .setUuid(nodeUuid)
- .setName(nodeNames)
- .setLayerProtocolName(layerProtocols)
- .setAdministrativeState(AdministrativeState.UNLOCKED)
- .setOperationalState(OperationalState.ENABLED)
- .setLifecycleState(LifecycleState.INSTALLED)
- .setOwnedNodeEdgePoint(onepl)
- .setNodeRuleGroup(nodeRuleGroupList)
- .build();
- return tapiNode;
+ return nodeUuid;
}
- private OwnedNodeEdgePoint createNep(TerminationPoint oorTp, List<Name> nepNames, LayerProtocolName nepProtocol,
- LayerProtocolName nodeProtocol, boolean withSip, String keyword) {
- String key = keyword + oorTp.getTpId().getValue();
+ private OwnedNodeEdgePoint createNep(TerminationPoint oorTp, Map<NameKey, Name> nepNames,
+ LayerProtocolName nepProtocol, LayerProtocolName nodeProtocol, boolean withSip, String keyword) {
+ String key = String.join("+", keyword, oorTp.getTpId().getValue());
OwnedNodeEdgePointBuilder onepBldr = new OwnedNodeEdgePointBuilder()
.setUuid(this.uuidMap.get(key))
.setLayerProtocolName(nepProtocol)
return onepBldr.build();
}
- private List<MappedServiceInterfacePoint> createSIP(int nb) {
- List<MappedServiceInterfacePoint> msipl = new ArrayList<>();
+ private Map<MappedServiceInterfacePointKey, MappedServiceInterfacePoint> createSIP(int nb) {
+ Map<MappedServiceInterfacePointKey, MappedServiceInterfacePoint> msipl = new HashMap<>();
for (int i = 0; i < nb; i++) {
MappedServiceInterfacePoint msip = new MappedServiceInterfacePointBuilder()
.setServiceInterfacePointUuid(new Uuid(UUID.randomUUID().toString())).build();
- msipl.add(msip);
+ msipl.put(msip.key(), msip);
}
return msipl;
}
private List<Class<? extends LAYERPROTOCOLQUALIFIER>> createSupportedCepLayerProtocolQualifier(TerminationPoint tp,
LayerProtocolName lpn) {
List<Class<? extends LAYERPROTOCOLQUALIFIER>> sclpqList = new ArrayList<>();
- List<SupportedInterfaceCapability> sicList = tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm
+ List<SupportedInterfaceCapability> sicList = new ArrayList<>(
+ tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm
.otn.network.topology.rev181130.TerminationPoint1.class).getTpSupportedInterfaces()
- .getSupportedInterfaceCapability();
+ .getSupportedInterfaceCapability().values());
for (SupportedInterfaceCapability sic : sicList) {
switch (lpn.getName()) {
- case "DSR" :
+ case "DSR":
if (sic.getIfCapType().getSimpleName().equals("If10GEODU2e")) {
sclpqList.add(DIGITALSIGNALTYPE10GigELAN.class);
sclpqList.add(ODUTYPEODU2E.class);
sclpqList.add(ODUTYPEODU4.class);
}
break;
- case "PHOTONIC_MEDIA" :
+ case "PHOTONIC_MEDIA":
if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4")) {
sclpqList.add(PHOTONICLAYERQUALIFIEROTSi.class);
sclpqList.add(PHOTONICLAYERQUALIFIEROMS.class);
private void createTapiTransitionalLinks() {
for (TerminationPoint tp : this.oorNetworkPortList) {
- List<NodeEdgePoint> nepList = new ArrayList<>();
- String sourceKey = "DSR+" + tp.getTpId().getValue();
+ Map<NodeEdgePointKey, NodeEdgePoint> nepList = new HashMap<>();
+ String sourceKey = String.join("+", this.ietfNodeId, DSR, tp.getTpId().getValue());
Uuid sourceUuidTp = this.uuidMap.get(sourceKey);
- String destKey = "iOTSi+" + tp.getTpId().getValue();
+ String destKey = String.join("+", this.ietfNodeId, I_OTSI, tp.getTpId().getValue());
Uuid destUuidTp = this.uuidMap.get(destKey);
NodeEdgePoint sourceNep = new NodeEdgePointBuilder()
.setTopologyUuid(this.tapiTopoUuid)
- .setNodeUuid(this.uuidMap.get(this.ietfNodeId + "+DSR"))
+ .setNodeUuid(this.uuidMap.get(String.join("+", this.ietfNodeId, DSR)))
.setNodeEdgePointUuid(sourceUuidTp)
.build();
- nepList.add(sourceNep);
+ nepList.put(sourceNep.key(), sourceNep);
NodeEdgePoint destNep = new NodeEdgePointBuilder()
.setTopologyUuid(this.tapiTopoUuid)
- .setNodeUuid(this.uuidMap.get(this.ietfNodeId + "+OTSi"))
+ .setNodeUuid(this.uuidMap.get(String.join("+", this.ietfNodeId, OTSI)))
.setNodeEdgePointUuid(destUuidTp)
.build();
- nepList.add(destNep);
- LinkBuilder transiLinkBldr = new LinkBuilder()
- .setUuid(new Uuid(UUID.randomUUID().toString()))
+ nepList.put(destNep.key(), destNep);
+ Name linkName = new NameBuilder().setValueName("transitional link name")
+ .setValue(String.join("--", this.ietfNodeId, sourceKey, destKey))
+ .build();
+ Link transiLink = new LinkBuilder()
+ .setUuid(new Uuid(
+ UUID.nameUUIDFromBytes((String.join("--", this.ietfNodeId, sourceKey, destKey))
+ .getBytes(Charset.forName("UTF-8")))
+ .toString()))
+ .setName(Map.of(linkName.key(), linkName))
.setTransitionedLayerProtocolName(Arrays.asList(LayerProtocolName.ODU.getName(),
LayerProtocolName.PHOTONICMEDIA.getName()))
.setNodeEdgePoint(nepList)
.setDirection(ForwardingDirection.BIDIRECTIONAL)
.setAvailableCapacity(new AvailableCapacityBuilder().setTotalSize(
- new TotalSizeBuilder().setUnit(CapacityUnit.GBPS).setValue(new BigInteger("100")).build()).build());
- this.tapiLinks.add(transiLinkBldr.build());
+ new TotalSizeBuilder().setUnit(CapacityUnit.GBPS).setValue(Uint64.valueOf(100)).build()).build())
+ .build();
+ this.tapiLinks.put(transiLink.key(), transiLink);
+ }
+ }
+
+ private Link createTapiLink(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226
+ .networks.network.Link link) {
+ String prefix = link.getLinkId().getValue().split("-")[0];
+ String sourceNode = link.getSource().getSourceNode().getValue();
+ String sourceTp = link.getSource().getSourceTp().toString();
+ String destNode = link.getDestination().getDestNode().getValue();
+ String destTp = link.getDestination().getDestTp().toString();
+ Map<NodeEdgePointKey, NodeEdgePoint> nepList = new HashMap<>();
+ Uuid sourceUuidTp;
+ Uuid sourceUuidNode;
+ Uuid destUuidTp;
+ Uuid destUuidNode;
+ Name linkName;
+ switch (prefix) {
+ case "OTU4":
+ sourceUuidTp = this.uuidMap.get(String.join("+", sourceNode, I_OTSI, sourceTp));
+ sourceUuidNode = this.uuidMap.get(String.join("+", sourceNode, OTSI));
+ NodeEdgePoint sourceNep = new NodeEdgePointBuilder()
+ .setTopologyUuid(this.tapiTopoUuid)
+ .setNodeUuid(sourceUuidNode)
+ .setNodeEdgePointUuid(sourceUuidTp)
+ .build();
+ nepList.put(sourceNep.key(), sourceNep);
+ destUuidTp = this.uuidMap.get(String.join("+", destNode, I_OTSI, destTp));
+ destUuidNode = this.uuidMap.get(String.join("+", destNode, OTSI));
+ NodeEdgePoint destNep = new NodeEdgePointBuilder()
+ .setTopologyUuid(this.tapiTopoUuid)
+ .setNodeUuid(destUuidNode)
+ .setNodeEdgePointUuid(destUuidTp)
+ .build();
+ nepList.put(destNep.key(), destNep);
+ linkName = new NameBuilder().setValueName("otn link name")
+ .setValue(link.getLinkId().getValue())
+ .build();
+ return new LinkBuilder()
+ .setUuid(new Uuid(
+ UUID.nameUUIDFromBytes((link.getLinkId().getValue())
+ .getBytes(Charset.forName("UTF-8")))
+ .toString()))
+ .setName(Map.of(linkName.key(), linkName))
+ .setLayerProtocolName(Arrays.asList(LayerProtocolName.PHOTONICMEDIA))
+ .setAdministrativeState(AdministrativeState.UNLOCKED)
+ .setOperationalState(OperationalState.ENABLED)
+ .setDirection(ForwardingDirection.BIDIRECTIONAL)
+ .setNodeEdgePoint(nepList)
+ .setTotalPotentialCapacity(new TotalPotentialCapacityBuilder().setTotalSize(
+ new TotalSizeBuilder().setUnit(CapacityUnit.GBPS)
+ .setValue(Uint64.valueOf(100)).build()).build())
+ .setAvailableCapacity(new AvailableCapacityBuilder().setTotalSize(
+ new TotalSizeBuilder().setUnit(CapacityUnit.MBPS)
+ .setValue(Uint64.valueOf(link.augmentation(Link1.class).getAvailableBandwidth())).build())
+ .build())
+ .build();
+ case "ODU4":
+ sourceUuidTp = this.uuidMap.get(String.join("+", sourceNode, DSR, sourceTp));
+ sourceUuidNode = this.uuidMap.get(String.join("+", sourceNode, DSR));
+ NodeEdgePoint sourceNep2 = new NodeEdgePointBuilder()
+ .setTopologyUuid(this.tapiTopoUuid)
+ .setNodeUuid(sourceUuidNode)
+ .setNodeEdgePointUuid(sourceUuidTp)
+ .build();
+ nepList.put(sourceNep2.key(), sourceNep2);
+ destUuidTp = this.uuidMap.get(String.join("+", destNode, DSR, destTp));
+ destUuidNode = this.uuidMap.get(String.join("+", destNode, DSR));
+ NodeEdgePoint destNep2 = new NodeEdgePointBuilder()
+ .setTopologyUuid(this.tapiTopoUuid)
+ .setNodeUuid(destUuidNode)
+ .setNodeEdgePointUuid(destUuidTp)
+ .build();
+ nepList.put(destNep2.key(), destNep2);
+ linkName = new NameBuilder().setValueName("otn link name")
+ .setValue(link.getLinkId().getValue())
+ .build();
+ return new LinkBuilder()
+ .setUuid(new Uuid(
+ UUID.nameUUIDFromBytes((link.getLinkId().getValue())
+ .getBytes(Charset.forName("UTF-8")))
+ .toString()))
+ .setName(Map.of(linkName.key(), linkName))
+ .setLayerProtocolName(Arrays.asList(LayerProtocolName.ODU))
+ .setAdministrativeState(AdministrativeState.UNLOCKED)
+ .setOperationalState(OperationalState.ENABLED)
+ .setDirection(ForwardingDirection.BIDIRECTIONAL)
+ .setNodeEdgePoint(nepList)
+ .setTotalPotentialCapacity(new TotalPotentialCapacityBuilder().setTotalSize(
+ new TotalSizeBuilder().setUnit(CapacityUnit.GBPS)
+ .setValue(Uint64.valueOf(100)).build()).build())
+ .setAvailableCapacity(new AvailableCapacityBuilder().setTotalSize(
+ new TotalSizeBuilder().setUnit(CapacityUnit.MBPS)
+ .setValue(Uint64.valueOf(link.augmentation(Link1.class).getAvailableBandwidth())).build())
+ .build())
+ .build();
+ default:
+ LOG.error("OTN link of type {} not managed yet", prefix);
+ return null;
}
}
- public List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node> getTapiNodes() {
+ public Map<NodeKey, org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node>
+ getTapiNodes() {
return tapiNodes;
}
- public List<Link> getTapiLinks() {
+ public Map<LinkKey, Link> getTapiLinks() {
return tapiLinks;
}
-}
+
+ public Map<String, Uuid> getUuidMap() {
+ return uuidMap;
+ }
+
+}
\ No newline at end of file
Code Review / transportpce.git / blobdiff