Device renderer support for intermediate rates

[transportpce.git] / renderer / src / main / java / org / opendaylight / transportpce / renderer / openroadminterface / OpenRoadmOtnInterface710.java

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java
index 1cce4be2a53dd9dca5d86a460ba583cff0752c9a..92ccc8ba53fbf4ce76d10ca7eeb2800dc359d7a7 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmOtnInterface710.java
@@ -13,7 +13,7 @@ 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.portmapping.rev210927.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.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;
@@ -64,7 +64,7 @@ public class OpenRoadmOtnInterface710 {
             .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());
@@ -98,9 +98,11 @@ public class OpenRoadmOtnInterface710 {
         List<String> supportingInterfaceList = new ArrayList<>();
         String supportingInterface = null;
         if (isNetworkPort) {
-            supportingInterface = portMap.getSupportingOduc4();
+            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) {