import java.util.Optional;
import java.util.TreeMap;
import org.opendaylight.transportpce.common.fixedflex.GridConstant;
+import org.opendaylight.transportpce.common.mapping.PortMapping;
import org.opendaylight.transportpce.pce.SortPortsByName;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.TerminationPoint1;
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.network.topology.rev200529.Node1;
-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.http.org.openroadm.network.types.rev200529.available.freq.map.AvailFreqMapsKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev190531.ServiceFormat;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.Node1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmNodeType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmTpType;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.available.freq.map.AvailFreqMapsKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOtsiOtsigroup;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat;
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.Node;
import org.opendaylight.yangtools.yang.common.Uint16;
private Node node;
private NodeId nodeId;
+ private String deviceNodeId;
private OpenroadmNodeType nodeType;
private AdminStates adminStates;
private State state;
+ private String serviceType;
+ private PortMapping portMapping;
private Map<String, OpenroadmTpType> availableSrgPp = new TreeMap<>();
private Map<String, OpenroadmTpType> availableSrgCp = new TreeMap<>();
private BitSet frequenciesBitSet;
private String version;
private BigDecimal slotWidthGranularity;
+ private BigDecimal centralFreqGranularity;
- public PceOpticalNode(Node node, OpenroadmNodeType nodeType, String version, BigDecimal slotWidthGranularity) {
- if (node != null
+ public PceOpticalNode(String deviceNodeId, String serviceType, PortMapping portMapping, Node node,
+ OpenroadmNodeType nodeType, String version, BigDecimal slotWidthGranularity,
+ BigDecimal centralFreqGranularity) {
+
+ if (deviceNodeId != null
+ && serviceType != null
+ && portMapping != null
+ && node != null
&& node.getNodeId() != null
&& nodeType != null
&& version != null
&& slotWidthGranularity != null) {
+ this.deviceNodeId = deviceNodeId;
+ this.serviceType = serviceType;
+ this.portMapping = portMapping;
this.node = node;
this.nodeId = node.getNodeId();
this.nodeType = nodeType;
this.version = version;
this.slotWidthGranularity = slotWidthGranularity;
+ this.centralFreqGranularity = centralFreqGranularity;
this.adminStates = node.augmentation(org.opendaylight.yang.gen.v1.http
- .org.openroadm.common.network.rev200529.Node1.class).getAdministrativeState();
+ .org.openroadm.common.network.rev211210.Node1.class).getAdministrativeState();
this.state = node.augmentation(org.opendaylight.yang.gen.v1.http
- .org.openroadm.common.network.rev200529.Node1.class).getOperationalState();
+ .org.openroadm.common.network.rev211210.Node1.class).getOperationalState();
} else {
LOG.error("PceNode: one of parameters is not populated : nodeId, node type, slot width granularity");
this.valid = false;
for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network
.node.TerminationPoint tp : allTps) {
TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class);
- org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1 = tp
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210
.TerminationPoint1.class);
OpenroadmTpType type = cntp1.getTpType();
LOG.info("type = {} for tp {}", type.getName(), tp);
}
private boolean isTerminationPointAvailable(
- org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1) {
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1) {
byte[] availableByteArray = new byte[GridConstant.NB_OCTECTS];
Arrays.fill(availableByteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE);
return nttp1 == null || nttp1.getPpAttributes() == null
availableByteArray);
}
+ private boolean isTpWithGoodCapabilities(
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node
+ .TerminationPoint tp) {
+ Mapping mapping = this.portMapping.getMapping(deviceNodeId, tp.getTpId().getValue());
+ if (mapping == null || mapping.getSupportedInterfaceCapability() == null) {
+ return true;
+ }
+ switch (this.serviceType) {
+ case "400GE":
+ for (Class<? extends SupportedIfCapability> ifCap : mapping.getSupportedInterfaceCapability()) {
+ if (ifCap.getSimpleName().equals(IfOtsiOtsigroup.class.getSimpleName())) {
+ return true;
+ }
+ }
+ return false;
+ case "100GE":
+ if (mapping.getSupportedInterfaceCapability().contains(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.IfOCH.class)
+ || mapping.getSupportedInterfaceCapability().contains(IfOCH.class)
+ || mapping.getSupportedInterfaceCapability().contains(IfOCHOTU4ODU4.class)) {
+ return true;
+ } else {
+ return false;
+ }
+ default:
+ return true;
+ }
+ }
+
public void initFrequenciesBitSet() {
if (!isValid()) {
return;
}
Node1 node1 = this.node.augmentation(Node1.class);
- org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 node11 =
- this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1
+ org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1 node11 =
+ this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.Node1
.class);
switch (this.nodeType) {
case SRG :
for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network
.node.TerminationPoint tp : allTps) {
TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class);
- org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp
- .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529
- .TerminationPoint1.class);
if (cntp1.getTpType() != OpenroadmTpType.XPONDERNETWORK) {
LOG.warn("initXndrTps: {} is not an Xponder network port", cntp1.getTpType().getName());
continue;
}
+ if (!isTpWithGoodCapabilities(tp)) {
+ LOG.warn("initXndrTps: {} network port has not correct if-capabilities", tp.getTpId().getValue());
+ continue;
+ }
if (!State.InService.equals(cntp1.getOperationalState())) {
LOG.warn("initXndrTps: XPONDER tp = {} is OOS/degraded", tp.getTpId().getValue());
this.valid = false;
continue;
}
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210.TerminationPoint1 nttp1 = tp
+ .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev211210
+ .TerminationPoint1.class);
if (nttp1 != null && nttp1.getXpdrNetworkAttributes().getWavelength() != null) {
this.usedXpndrNWTps.add(tp.getTpId().getValue());
LOG.info("initXndrTps: XPONDER tp = {} is used", tp.getTpId().getValue());
}
// find Client of this network TP
String client;
- org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1 tpceTp1 =
- tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019
+ org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123.TerminationPoint1 tpceTp1 =
+ tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev220123
.TerminationPoint1.class);
if (tpceTp1 != null) {
client = tpceTp1.getAssociatedConnectionMapPort();
}
@Override
- public String getRdmSrgClient(String tp) {
+ public String getRdmSrgClient(String tp, String direction) {
LOG.info("getRdmSrgClient: Getting PP client for tp '{}' on node : {}", tp, this.nodeId);
OpenroadmTpType srgType = null;
OpenroadmTpType cpType = this.availableSrgCp.get(tp);
switch (cpType) {
case SRGTXRXCP:
LOG.info("getRdmSrgClient: Getting BI Directional PP port ...");
- srgType = OpenroadmTpType.SRGTXRXPP;
+ // Take the first-element in the available PP key set
+ if (availableSrgPp.entrySet().iterator().next().getKey()
+ // and check if the port is bidirectional
+ .contains("TXRX")) {
+ srgType = OpenroadmTpType.SRGTXRXPP;
+ } else if (direction.equalsIgnoreCase("aToz")) {
+ srgType = OpenroadmTpType.SRGRXPP;
+ } else {
+ srgType = OpenroadmTpType.SRGTXPP;
+ }
break;
case SRGTXCP:
LOG.info("getRdmSrgClient: Getting UNI Rx PP port ...");
return;
}
// Detect A and Z
- if (this.getSupNetworkNodeId().equals(anodeId) || (this.getSupNetworkNodeId().equals(znodeId))) {
+ if (anodeId.contains(this.getSupNetworkNodeId()) || (znodeId.contains(this.getSupNetworkNodeId()))) {
LOG.info("validateAZxponder: A or Z node detected == {}", nodeId.getValue());
initXndrTps(serviceFormat);
return;
return slotWidthGranularity;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.opendaylight.transportpce.pce.networkanalyzer.PceNode#getCentralFreqGranularity()
+ */
+ @Override
+ public BigDecimal getCentralFreqGranularity() {
+ return centralFreqGranularity;
+ }
+
}
Code Review / transportpce.git / blobdiff