package org.opendaylight.transportpce.pce.networkanalyzer;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenation;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenation.FiberType;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenationKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.link.oms.attributes.Span;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType;
-import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.OtnLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev211210.span.attributes.LinkConcatenation1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev211210.span.attributes.LinkConcatenation1.FiberType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.networks.network.link.oms.attributes.Span;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.link.concatenation.LinkConcatenation;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.link.concatenation.LinkConcatenationKey;
+import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.OtnLinkType;
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.topology.rev180226.LinkId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final OpenroadmLinkType linkType;
private final NodeId sourceId;
private final NodeId destId;
- private transient Object sourceTP;
- private transient Object destTP;
+ private final TpId sourceTP;
+ private final TpId destTP;
private final String sourceNetworkSupNodeId;
private final String destNetworkSupNodeId;
private final String sourceCLLI;
private final String destCLLI;
private final LinkId oppositeLink;
+ private final AdminStates adminStates;
+ private final State state;
private final Long latency;
private final Long availableBandwidth;
private final Long usedBandwidth;
this.oppositeLink = calcOpposite(link);
+ this.adminStates = link.augmentation(Link1.class).getAdministrativeState();
+ this.state = link.augmentation(Link1.class).getOperationalState();
+
if (this.linkType == OpenroadmLinkType.ROADMTOROADM) {
this.omsAttributesSpan = MapUtils.getOmsAttributesSpan(link);
this.srlgList = MapUtils.getSRLG(link);
LOG.debug("In PceLink: cannot compute the latency for the link {}", link.getLinkId().getValue());
return 1L;
}
- tmp += entry.getValue().getSRLGLength().toJava() / CELERITY;
+ tmp += entry.getValue().getSRLGLength().doubleValue() / CELERITY;
LOG.info("In PceLink: The latency of link {} == {}", link.getLinkId(), tmp);
}
return (long) Math.ceil(tmp);
}
//Compute the OSNR of a span
- public double calcSpanOSNR() {
+ private double calcSpanOSNR() {
if (this.omsAttributesSpan == null) {
return 0L;
}
return 0L;
}
// power on the output of the previous ROADM (dBm)
- double pout = retrievePower(linkConcatenationiterator.next().getFiberType());
+ double pout = retrievePower(linkConcatenationiterator.next().augmentation(LinkConcatenation1.class)
+ .getFiberType());
// span loss (dB)
double spanLoss = this.omsAttributesSpan.getSpanlossCurrent().getValue().doubleValue();
// power on the input of the current ROADM (dBm)
return oppositeLink;
}
- public Object getSourceTP() {
+ public AdminStates getAdminStates() {
+ return adminStates;
+ }
+
+ public State getState() {
+ return state;
+ }
+
+ public TpId getSourceTP() {
return sourceTP;
}
- public Object getDestTP() {
+ public TpId getDestTP() {
return destTP;
}
}
OtnLinkType otnLinkType = link
- .augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.Link1.class)
+ .augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.Link1.class)
.getOtnLinkType();
if (this.availableBandwidth == 0L) {
LOG.error("PceLink: No bandwidth available for OTN Link, link {} is ignored ", linkId);
long neededBW;
OtnLinkType neededType = null;
switch (serviceType) {
-
+ case "ODUC2":
+ if (this.usedBandwidth != 0L) {
+ return false;
+ }
+ neededBW = 200000L;
+ // Add intermediate rate otn-link-type
+ neededType = OtnLinkType.OTUC2;
+ break;
+ case "ODUC3":
+ if (this.usedBandwidth != 0L) {
+ return false;
+ }
+ neededBW = 300000L;
+ // hange otn-link-type
+ neededType = OtnLinkType.OTUC3;
+ break;
+ case "ODUC4":
+ if (this.usedBandwidth != 0L) {
+ return false;
+ }
+ neededBW = 400000L;
+ neededType = OtnLinkType.OTUC4;
+ break;
case "ODU4":
+ case "100GEs":
if (this.usedBandwidth != 0L) {
return false;
}
case "ODU1":
neededBW = 2500L;
break;
+ case "100GEm":
+ neededBW = 100000L;
+ // TODO: Here link type needs to be changed, based on the line-rate
+ neededType = OtnLinkType.ODUC4;
+ break;
case "10GE":
neededBW = 10000L;
neededType = OtnLinkType.ODTU4;
LOG.error("PceLink: No Link type or opposite link is available. Link is ignored {}", linkId);
return false;
}
+ if ((this.adminStates == null) || (this.state == null)) {
+ LOG.error("PceLink: Link is not available. Link is ignored {}", linkId);
+ return false;
+ }
if ((this.sourceId == null) || (this.destId == null) || (this.sourceTP == null) || (this.destTP == null)) {
LOG.error("PceLink: No Link source or destination is available. Link is ignored {}", linkId);
return false;
public String toString() {
return "PceLink type=" + linkType + " ID=" + linkId.getValue() + " latency=" + latency;
}
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- out.defaultWriteObject();
- out.writeObject(this.sourceTP);
- out.writeObject(this.destTP);
- }
-
- private void readObject(ObjectInputStream in) throws IOException,ClassNotFoundException {
- in.defaultReadObject();
- this.sourceTP = in.readObject();
- this.destTP = in.readObject();
- }
}
Code Review / transportpce.git / blobdiff