import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.transportpce.common.StringConstants;
+import org.opendaylight.transportpce.common.Timeouts;
+import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface;
import org.opendaylight.transportpce.common.mapping.PortMapping;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.Mapping;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PowerDBm;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.R100G;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.OrgOpenroadmDevice;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnections;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev171215.AdminStates;
import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.EthAttributes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.ethernet.interfaces.rev181019.Interface1;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.opu.OpuBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.OtuAttributes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.otu.container.OtuBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-
public class OpenRoadmInterface221 {
private final PortMapping portMapping;
private final OpenRoadmInterfaces openRoadmInterfaces;
this.fixedFlex = fixedFlex;
}
- public String createOpenRoadmEthInterface(String nodeId,
- String logicalConnPoint) throws OpenRoadmInterfaceException {
+ public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint)
+ throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and"
// Ethernet interface specific data
EthernetBuilder ethIfBuilder = new EthernetBuilder();
- ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled);
- ethIfBuilder.setDuplex(EthAttributes.Duplex.Full);
ethIfBuilder.setFec(EthAttributes.Fec.Off);
ethIfBuilder.setSpeed(100000L);
- ethIfBuilder.setMtu(9000L);
InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class,
- logicalConnPoint + "-ETHERNET");
+ logicalConnPoint + "-ETHERNET");
// Create Interface1 type object required for adding as augmentation
Interface1Builder ethIf1Builder = new Interface1Builder();
ethInterfaceBldr.addAugmentation(Interface1.class, ethIf1Builder.setEthernet(ethIfBuilder.build()).build());
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, ethInterfaceBldr);
+
+ // Post the equipment-state change on the device circuit-pack
+ openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true);
+
return ethInterfaceBldr.getName();
}
* This methods creates an OCH interface on the given termination point on
* Roadm.
*
+ * @param nodeId node ID
+ * @param logicalConnPoint logical connection point
* @param waveNumber wavelength number of the OCH interface.
+ *
* @return Name of the interface if successful, otherwise return null.
+ *
+ * @throws OpenRoadmInterfaceException OpenRoadm interface exception
*/
public List<String> createFlexOCH(String nodeId, String logicalConnPoint, Long waveNumber)
List<String> interfacesCreated = new ArrayList<>();
- String nmcInterfaceCreated = createNMCInterface(nodeId,logicalConnPoint,waveNumber);
- interfacesCreated.add(nmcInterfaceCreated);
+ if (logicalConnPoint.contains("DEG")) {
+ String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber);
+ interfacesCreated.add(mcInterfaceCreated);
+ }
- String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber);
- interfacesCreated.add(mcInterfaceCreated);
+ String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber);
+ interfacesCreated.add(nmcInterfaceCreated);
return interfacesCreated;
}
public String createMCInterface(String nodeId, String logicalConnPoint, Long waveNumber)
throws OpenRoadmInterfaceException {
- //TODO : Check this method
+ // TODO : Check this method
fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue());
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
- throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and"
- + " logical connection port %s", nodeId, logicalConnPoint));
+ throw new OpenRoadmInterfaceException(
+ String.format("Unable to get mapping from PortMapping for node % and logical connection port %s",
+ nodeId, logicalConnPoint));
}
- //TODO : Check this method
+ // TODO : Check this method
InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap,
- MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc");
+ MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + waveNumber);
mcInterfaceBldr.setSupportingInterface(portMap.getSupportingOms());
McTtpBuilder mcTtpBuilder = new McTtpBuilder();
// Create Interface1 type object required for adding as augmentation
org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder
- interface1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel
- .interfaces.rev181019.Interface1Builder();
+ interface1Builder =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder();
interface1Builder.setMcTtp(mcTtpBuilder.build());
- mcInterfaceBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel
- .interfaces.rev181019.Interface1.class,interface1Builder.build());
+ mcInterfaceBldr.addAugmentation(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class,
+ interface1Builder.build());
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, mcInterfaceBldr);
public String createNMCInterface(String nodeId, String logicalConnPoint, Long waveNumber)
throws OpenRoadmInterfaceException {
- //TODO : Check this method
+ // TODO : Check this method
fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue());
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
- throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and"
- + " logical connection port %s", nodeId, logicalConnPoint));
+ throw new OpenRoadmInterfaceException(
+ String.format("Unable to get mapping from PortMapping for node % and logical connection port %s",
+ nodeId, logicalConnPoint));
}
+ LOG.info(" Freq Start {} and Freq End {} and center-Freq {}",
+ String.valueOf(fixedFlex.getStart()), String.valueOf(fixedFlex.getStop()),
+ String.valueOf(fixedFlex.getCenterFrequency()));
//TODO : Check this method
InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap,
- NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc");
- nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc");
+ NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc" + "-" + waveNumber);
+ if (logicalConnPoint.contains("DEG")) {
+ nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + waveNumber);
+ }
NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder();
nmcCtpIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency())));
- nmcCtpIfBuilder.setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(fixedFlex.getWavelength())));
+ nmcCtpIfBuilder.setWidth(FrequencyGHz.getDefaultInstance("40"));
// Create Interface1 type object required for adding as augmentation
- org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019
- .Interface1Builder nmcCtpI1fBuilder = new org.opendaylight.yang.gen.v1.http
- .org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder();
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder
+ nmcCtpI1fBuilder = new
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019
+ .Interface1Builder();
nmcCtpI1fBuilder.setNmcCtp(nmcCtpIfBuilder.build());
- nmcInterfaceBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network
- .media.channel.interfaces.rev181019.Interface1.class,nmcCtpI1fBuilder.build());
+ nmcInterfaceBldr.addAugmentation(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1.class,
+ nmcCtpI1fBuilder.build());
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr);
public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber)
throws OpenRoadmInterfaceException {
- //TODO : Check this method
+ // TODO : Check this method
fixedFlex = fixedFlex.getFixedFlexWaveMapping(waveNumber.shortValue());
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
- throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node %s and"
- + " logical connection port %s", nodeId, logicalConnPoint));
+ throw new OpenRoadmInterfaceException(
+ String.format("Unable to get mapping from PortMapping for node %s and logical connection port %s",
+ nodeId, logicalConnPoint));
}
// OCH interface specific data
OchBuilder ocIfBuilder = new OchBuilder();
ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency())));
- //ocIfBuilder.setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(fixedFlex.getWavelength())));
- //ocIfBuilder.setModulationFormat(ModulationFormat.DpQpsk);
ocIfBuilder.setRate(R100G.class);
ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5")));
// Create Interface1 type object required for adding as augmentation
// TODO look at imports of different versions of class
org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1Builder
- ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces
- .rev181019.Interface1Builder();
+ ochIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019
+ .Interface1Builder();
ochInterfaceBldr.addAugmentation(
- org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1.class,
- ochIf1Builder.setOch(ocIfBuilder.build()).build());
+ org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev181019.Interface1.class,
+ ochIf1Builder.setOch(ocIfBuilder.build()).build());
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, ochInterfaceBldr);
+
+ // Post the equipment-state change on the device circuit-pack if xpdr node
+ if (portMap.getLogicalConnectionPoint().contains(StringConstants.NETWORK_TOKEN)) {
+ this.openRoadmInterfaces.postEquipmentState(nodeId, portMap.getSupportingCircuitPackName(), true);
+ }
+
return ochInterfaceBldr.getName();
}
public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface)
- throws OpenRoadmInterfaceException {
+ throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
- throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and"
- + " logical connection port %s", nodeId, logicalConnPoint));
+ throw new OpenRoadmInterfaceException(
+ String.format("Unable to get mapping from PortMapping for node % and logical connection port %s",
+ nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class,
- logicalConnPoint + "-ODU");
+ logicalConnPoint + "-ODU");
oduInterfaceBldr.setSupportingInterface(supportingOtuInterface);
// ODU interface specific data
oduIfBuilder.setRate(ODU4.class);
oduIfBuilder.setMonitoringMode(OduAttributes.MonitoringMode.Terminated);
- //Set Opu attributes
+ // Set Opu attributes
OpuBuilder opuBldr = new OpuBuilder();
opuBldr.setPayloadType(PayloadTypeDef.getDefaultInstance("07"));
opuBldr.setExpPayloadType(PayloadTypeDef.getDefaultInstance("07"));
oduIfBuilder.setOpu(opuBldr.build());
-
// Create Interface1 type object required for adding as augmentation
// TODO look at imports of different versions of class
org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder oduIf1Builder =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder();
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1Builder();
oduInterfaceBldr.addAugmentation(
- org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class,
- oduIf1Builder.setOdu(oduIfBuilder.build()).build());
+ org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class,
+ oduIf1Builder.setOdu(oduIfBuilder.build()).build());
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, oduInterfaceBldr);
}
public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface)
- throws OpenRoadmInterfaceException {
+ throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
- throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and"
- + " logical connection port %s", nodeId, logicalConnPoint));
+ throw new OpenRoadmInterfaceException(
+ String.format("Unable to get mapping from PortMapping for node % and logical connection port %s",
+ nodeId, logicalConnPoint));
}
// Create generic interface
InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class,
- logicalConnPoint + "-OTU");
+ logicalConnPoint + "-OTU");
otuInterfaceBldr.setSupportingInterface(supportOchInterface);
// OTU interface specific data
// Create Interface1 type object required for adding as augmentation
// TODO look at imports of different versions of class
org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder otuIf1Builder =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder();
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1Builder();
otuInterfaceBldr.addAugmentation(
- org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class,
- otuIf1Builder.setOtu(otuIfBuilder.build()).build());
+ org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class,
+ otuIf1Builder.setOtu(otuIfBuilder.build()).build());
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, otuInterfaceBldr);
}
private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class<? extends InterfaceType> type,
- String key) {
+ String key) {
InterfaceBuilder interfaceBuilder = new InterfaceBuilder();
interfaceBuilder.setDescription(" TBD ");
interfaceBuilder.setCircuitId(" TBD ");
omsInterfaceBldr.setSupportingInterface(mapping.getSupportingOts());
} else {
LOG.error("Unable to get ots interface from mapping {} - {}", nodeId,
- mapping.getLogicalConnectionPoint());
+ mapping.getLogicalConnectionPoint());
return null;
}
this.openRoadmInterfaces.postInterface(nodeId, omsInterfaceBldr);
if (mapping.getSupportingOts() == null) {
// Create generic interface
InterfaceBuilder otsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpticalTransport.class, "OTS-"
- + mapping.getLogicalConnectionPoint());
+ + mapping.getLogicalConnectionPoint());
// OTS interface augmentation specific data
OtsBuilder otsIfBuilder = new OtsBuilder();
otsIfBuilder.setFiberType(OtsAttributes.FiberType.Smf);
// Create Interface1 type object required for adding as
// augmentation
- org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019
- .Interface1Builder otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org
- .openroadm.optical.transport
- .interfaces.rev181019.Interface1Builder();
+ org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019.Interface1Builder
+ otsIf1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces
+ .rev181019.Interface1Builder();
otsInterfaceBldr.addAugmentation(
- org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019
- .Interface1.class,
- otsIf1Builder.setOts(otsIfBuilder.build()).build());
+ org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev181019.Interface1.class,
+ otsIf1Builder.setOts(otsIfBuilder.build()).build());
this.openRoadmInterfaces.postInterface(nodeId, otsInterfaceBldr);
this.portMapping.updateMapping(nodeId, mapping);
return otsInterfaceBldr.build().getName();
}
}
+ public boolean isUsedByXc(String nodeId, String interfaceName, String xc,
+ DeviceTransactionManager deviceTransactionManager) {
+ InstanceIdentifier<RoadmConnections> xciid = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ .child(RoadmConnections.class, new RoadmConnectionsKey(xc));
+ LOG.info("reading xc {} in node {}", xc, nodeId);
+ Optional<RoadmConnections> crossconnection = deviceTransactionManager.getDataFromDevice(nodeId,
+ LogicalDatastoreType.CONFIGURATION, xciid, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (crossconnection.isPresent()) {
+ RoadmConnections rc = crossconnection.get();
+ LOG.info("xd {} found", xc);
+ String supportedinter = null;
+ if (!interfaceName.contains("nmc")) {
+ supportedinter = interfaceName.replace("mc", "nmc");
+ }
+ if (rc.getSource().getSrcIf().equals(interfaceName)
+ || rc.getDestination().getDstIf().equals(interfaceName)
+ || rc.getSource().getSrcIf().equals(supportedinter)
+ || rc.getDestination().getDstIf().equals(supportedinter)) {
+ return true;
+ }
+ } else {
+ LOG.info("xd {} not found !", xc);
+ }
+ return false;
+ }
+
}
Code Review / transportpce.git / blobdiff