*/
package org.opendaylight.transportpce.renderer.openroadminterface;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
import java.util.stream.IntStream;
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.device.renderer.rev211004.az.api.info.AEndApiInfo;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.ZEndApiInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
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.equipment.states.types.rev171215.AdminStates;
return ethernetInterfaceName;
}
- public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint, String serviceName,
+ public String createOpenRoadmOdu2eInterface(String nodeId, String logicalConnPoint,
boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ,
String payloadType) throws OpenRoadmInterfaceException {
String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class,
- logicalConnPoint + "-ODU2e-" + serviceName);
+ logicalConnPoint + "-ODU2e");
if (mapping.getSupportingOdu4() != null) {
oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4());
}
if (isCTP) {
oduFunction = ODUCTP.class;
monitoringMode = MonitoringMode.Monitored;
- List<Uint16> tribSlots = new ArrayList<>();
+ Set<Uint16> tribSlots = new HashSet<>();
Uint16 newIdx = Uint16.valueOf(tribSlotIndex);
tribSlots.add(newIdx);
IntStream.range(tribSlotIndex, tribSlotIndex + 8)
return oduInterfaceBldr.getName();
}
- public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint, String serviceName,
+ public String createOpenRoadmOdu0Interface(String nodeId, String logicalConnPoint,
boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ,
String payloadType) throws OpenRoadmInterfaceException {
String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class,
- logicalConnPoint + "-ODU0-" + serviceName);
+ logicalConnPoint + "-ODU0");
if (mapping.getSupportingOdu4() != null) {
oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4());
}
if (isCTP) {
oduFunction = ODUCTP.class;
monitoringMode = MonitoringMode.Monitored;
- List<Uint16> tribSlots = new ArrayList<>();
+ Set<Uint16> tribSlots = new HashSet<>();
Uint16 newIdx = Uint16.valueOf(tribSlotIndex);
tribSlots.add(newIdx);
IntStream.range(tribSlotIndex, tribSlotIndex + 8)
return oduInterfaceBldr.getName();
}
- public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint, String serviceName,
+ public String createOpenRoadmOdu2Interface(String nodeId, String logicalConnPoint,
boolean isCTP, int tribPortNumber, int tribSlotIndex, AEndApiInfo apiInfoA, ZEndApiInfo apiInfoZ,
String payloadType) throws OpenRoadmInterfaceException {
String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint));
}
InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(mapping, OtnOdu.class,
- logicalConnPoint + "-ODU2-" + serviceName);
+ logicalConnPoint + "-ODU2");
if (mapping.getSupportingOdu4() != null) {
oduInterfaceBldr.setSupportingInterface(mapping.getSupportingOdu4());
}
if (isCTP) {
oduFunction = ODUCTP.class;
monitoringMode = MonitoringMode.Monitored;
- List<Uint16> tribSlots = new ArrayList<>();
+ Set<Uint16> tribSlots = new HashSet<>();
Uint16 newIdx = Uint16.valueOf(tribSlotIndex);
tribSlots.add(newIdx);
IntStream.range(tribSlotIndex, tribSlotIndex + 8)