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.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.common.attributes.rev200327.parent.odu.allocation.ParentOduAllocationBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.attributes.rev200327.parent.odu.allocation.parent.odu.allocation.trib.slots.choice.OpucnBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev200529.Off;
.setSpeed(Uint32.valueOf(100000));
InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(
portMap, EthernetCsmacd.class,
- logicalConnPoint + "-ETHERNET100G");
+ logicalConnPoint + "-ETHERNET-100G");
// Create Interface1 type object required for adding as augmentation
Interface1Builder ethIf1Builder = new Interface1Builder();
ethInterfaceBldr.addAugmentation(ethIf1Builder.setEthernet(ethIfBuilder.build()).build());
}
public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint,
- String serviceName, String payLoad,
- boolean isNetworkPort, OpucnTribSlotDef minTribSlotNumber, OpucnTribSlotDef maxTribSlotNumber)
+ String payLoad, boolean isNetworkPort, OpucnTribSlotDef minTribSlotNumber, OpucnTribSlotDef maxTribSlotNumber)
throws OpenRoadmInterfaceException {
Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint);
if (portMap == null) {
String supportingInterface = null;
if (isNetworkPort) {
supportingInterface = portMap.getSupportingOducn();
+ // TODO: remove this log
+ LOG.info("ODUCn supporting interface on port mapping {}", supportingInterface);
} else {
- supportingInterface = logicalConnPoint + "-ETHERNET100G";
+ supportingInterface = logicalConnPoint + "-ETHERNET-100G";
}
if (supportingInterface == null) {
supportingInterfaceList.add(supportingInterface);
InterfaceBuilder oduIfBuilder = createGenericInterfaceBuilder(
- portMap, OtnOdu.class, logicalConnPoint + "-ODU4-" + serviceName)
+ portMap, OtnOdu.class, logicalConnPoint + "-ODU4")
.setSupportingInterfaceList(supportingInterfaceList);
// Agument ODU4 specific interface data
OduBuilder oduBuilder = new OduBuilder().setRate(ODU4.class)