From: Balagangadhar Bathula Date: Thu, 26 May 2022 11:35:57 +0000 (-0400) Subject: Fix bug in 200G 31.6 GBaud renderer X-Git-Tag: 4.3.0~6 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=c79d74b20a7b493a199883657310655b9d722055 Fix bug in 200G 31.6 GBaud renderer - Instance ID for 200G OTSi group should be 2 not 4. - Fix the issue with interface naming when the source-tp is not null and has network-token Signed-off-by: Balagangadhar Bathula Change-Id: Iad341cb0f4357feb8288141d87b3348fb03f3f6d --- diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java index d34294e5f..0cebc9f6f 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java @@ -224,8 +224,7 @@ public class OpenRoadmInterface710 { LOG.info("FOIC is 2.8 for 31.6 Gbaud and rate is 200"); // FOIC rate is different flexoBuilder.setFoicType(Foic28.class) - .setIid(new ArrayList<>(Arrays.asList(Uint8.valueOf(1), Uint8.valueOf(2), - Uint8.valueOf(3), Uint8.valueOf(4)))); + .setIid(new ArrayList<>(Arrays.asList(Uint8.valueOf(1), Uint8.valueOf(2)))); } else { // default is dp-qpsk for 200G under 63.1 GBaud flexoBuilder.setFoicType(Foic24.class) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index 41d175e29..3ad6ee347 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -188,6 +188,12 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( nodeId, srcTp, spectrumInformation); createdOchInterfaces.add(supportingOchInterface); + // Split the string based on # pass the last element as the supported Interface + // This is needed for 7.1 device models with B100G, we have OTSI, OTSI-group combined as OCH + String[] listOfSuppOchInf = supportingOchInterface.split("#"); + createdOchInterfaces = Arrays.asList(listOfSuppOchInf); + // Taking the last element + supportingOchInterface = createdOchInterfaces.get(createdOchInterfaces.size() - 1); String supportingOtuInterface = this.openRoadmInterfaceFactory.createOpenRoadmOtu4Interface( nodeId, srcTp, supportingOchInterface, apiInfoA, apiInfoZ); createdOtuInterfaces.add(supportingOtuInterface);