Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add node-info in portmapping structure
[transportpce.git]
/
renderer
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
renderer
/
openroadminterface
/
OpenRoadmInterface221.java
diff --git
a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
index a540f6e62c91bd95eb18fc0982e0054ca86aa710..4b063ab4f5b4063cc594f5cceb8b9d1c843d8b8e 100644
(file)
--- a/
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
+++ b/
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
@@
-21,7
+21,7
@@
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.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.rev1
70228
.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev1
90702
.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.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;
@@
-85,11
+85,11
@@
public class OpenRoadmInterface221 {
// Ethernet interface specific data
EthernetBuilder ethIfBuilder = new EthernetBuilder();
// Ethernet interface specific data
EthernetBuilder ethIfBuilder = new EthernetBuilder();
- ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled);
- ethIfBuilder.setDuplex(EthAttributes.Duplex.Full);
+
//
ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled);
+
//
ethIfBuilder.setDuplex(EthAttributes.Duplex.Full);
ethIfBuilder.setFec(EthAttributes.Fec.Off);
ethIfBuilder.setSpeed(100000L);
ethIfBuilder.setFec(EthAttributes.Fec.Off);
ethIfBuilder.setSpeed(100000L);
- ethIfBuilder.setMtu(9000L);
+
//
ethIfBuilder.setMtu(9000L);
InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class,
logicalConnPoint + "-ETHERNET");
InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class,
logicalConnPoint + "-ETHERNET");
@@
-110,8
+110,13
@@
public class OpenRoadmInterface221 {
* This methods creates an OCH interface on the given termination point on
* Roadm.
*
* 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.
* @param waveNumber wavelength number of the OCH interface.
+ *
* @return Name of the interface if successful, otherwise return null.
* @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)
*/
public List<String> createFlexOCH(String nodeId, String logicalConnPoint, Long waveNumber)
@@
-119,12
+124,14
@@
public class OpenRoadmInterface221 {
List<String> interfacesCreated = new ArrayList<>();
List<String> interfacesCreated = new ArrayList<>();
+ if (logicalConnPoint.contains("DEG")) {
+ String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber);
+ interfacesCreated.add(mcInterfaceCreated);
+ }
+
String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber);
interfacesCreated.add(nmcInterfaceCreated);
String nmcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, waveNumber);
interfacesCreated.add(nmcInterfaceCreated);
- String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, waveNumber);
- interfacesCreated.add(mcInterfaceCreated);
-
return interfacesCreated;
}
return interfacesCreated;
}
@@
-137,14
+144,15
@@
public class OpenRoadmInterface221 {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
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
InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap,
}
// 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();
mcInterfaceBldr.setSupportingInterface(portMap.getSupportingOms());
McTtpBuilder mcTtpBuilder = new McTtpBuilder();
@@
-153,8
+161,8
@@
public class OpenRoadmInterface221 {
// Create Interface1 type object required for adding as augmentation
org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder
// 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.setMcTtp(mcTtpBuilder.build());
mcInterfaceBldr.addAugmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class,
@@
-174,26
+182,36
@@
public class OpenRoadmInterface221 {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
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
+ 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,
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())));
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
// 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();
+ 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());
nmcCtpI1fBuilder.setNmcCtp(nmcCtpIfBuilder.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);
return nmcInterfaceBldr.getName();
// Post interface on the device
openRoadmInterfaces.postInterface(nodeId, nmcInterfaceBldr);
return nmcInterfaceBldr.getName();
@@
-207,16
+225,15
@@
public class OpenRoadmInterface221 {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
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())));
}
// 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")));
ocIfBuilder.setRate(R100G.class);
ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5")));
@@
-247,8
+264,9
@@
public class OpenRoadmInterface221 {
throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
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");
}
InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class,
logicalConnPoint + "-ODU");
@@
-267,9
+285,8
@@
public class OpenRoadmInterface221 {
// Create Interface1 type object required for adding as augmentation
// TODO look at imports of different versions of class
// 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();
+ 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();
oduInterfaceBldr.addAugmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class,
oduIf1Builder.setOdu(oduIfBuilder.build()).build());
oduInterfaceBldr.addAugmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev181019.Interface1.class,
oduIf1Builder.setOdu(oduIfBuilder.build()).build());
@@
-283,8
+300,9
@@
public class OpenRoadmInterface221 {
throws OpenRoadmInterfaceException {
Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
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,
}
// Create generic interface
InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class,
@@
-298,9
+316,8
@@
public class OpenRoadmInterface221 {
// Create Interface1 type object required for adding as augmentation
// TODO look at imports of different versions of class
// 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();
+ 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();
otuInterfaceBldr.addAugmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class,
otuIf1Builder.setOtu(otuIfBuilder.build()).build());
otuInterfaceBldr.addAugmentation(
org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev181019.Interface1.class,
otuIf1Builder.setOtu(otuIfBuilder.build()).build());