Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor code after Chlorine Bump
[transportpce.git]
/
common
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
common
/
mapping
/
PortMappingVersion121.java
diff --git
a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
index cded0f0779dff2d7e1089aa6dc9ed7a65b0c1b1d..ae65f9951ca449aee62a0a263228e3f93e83f35a 100644
(file)
--- a/
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
+++ b/
common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java
@@
-102,6
+102,7
@@
public class PortMappingVersion121 {
Direction.Bidirectional, "TXRX");
}
Direction.Bidirectional, "TXRX");
}
+
public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) {
this.dataBroker = dataBroker;
this.deviceTransactionManager = deviceTransactionManager;
public PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) {
this.dataBroker = dataBroker;
this.deviceTransactionManager = deviceTransactionManager;
@@
-610,8
+611,7
@@
public class PortMappingVersion121 {
}
private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) {
}
private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) {
- mpBldr.setSupportingOtu4(null)
- .setSupportingOdu4(null);
+ mpBldr.setSupportingOtu4(null).setSupportingOdu4(null);
for (Interfaces interfaces : port.getInterfaces()) {
Optional<Interface> openRoadmInterface = getInterfaceFromDevice(nodeId, interfaces.getInterfaceName());
if (openRoadmInterface.isEmpty()) {
for (Interfaces interfaces : port.getInterfaces()) {
Optional<Interface> openRoadmInterface = getInterfaceFromDevice(nodeId, interfaces.getInterfaceName());
if (openRoadmInterface.isEmpty()) {
@@
-619,23
+619,18
@@
public class PortMappingVersion121 {
nodeId, interfaces.getInterfaceName() + "- empty interface");
continue;
}
nodeId, interfaces.getInterfaceName() + "- empty interface");
continue;
}
- LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG,
- nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
InterfaceType interfaceType = openRoadmInterface.get().getType();
InterfaceType interfaceType = openRoadmInterface.get().getType();
- // Check if interface type is OMS or OTS
+ LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, nodeId, openRoadmInterface.get().getName(), interfaceType);
+ // Switch/Case might be more indicated here but is not possible in jdk17 w/o enable-preview
if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) {
mpBldr.setSupportingOms(interfaces.getInterfaceName());
if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) {
mpBldr.setSupportingOms(interfaces.getInterfaceName());
- }
- if (interfaceType.equals(OpticalTransport.VALUE)) {
+ } else if (interfaceType.equals(OpticalTransport.VALUE)) {
mpBldr.setSupportingOts(interfaces.getInterfaceName());
mpBldr.setSupportingOts(interfaces.getInterfaceName());
- }
- if (interfaceType.equals(OtnOtu.VALUE)) {
+ } else if (interfaceType.equals(OtnOtu.VALUE)) {
mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
- }
- if (interfaceType.equals(OtnOdu.VALUE)) {
+ } else if (interfaceType.equals(OtnOdu.VALUE)) {
mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
- }
- if (interfaceType.equals(EthernetCsmacd.VALUE)) {
+ } else if (interfaceType.equals(EthernetCsmacd.VALUE)) {
mpBldr.setSupportingEthernet(interfaces.getInterfaceName());
}
}
mpBldr.setSupportingEthernet(interfaces.getInterfaceName());
}
}