From fd50b7d2443e8d6da3796695bf56069aef65d240 Mon Sep 17 00:00:00 2001 From: Balagangadhar Bathula Date: Wed, 2 Feb 2022 01:25:33 -0500 Subject: [PATCH] Unrecognized if-supported-capabilities - If device reports supported-if-capabilities that are not present in the MappingUtils, it gives a null pointer exception. - Add some missing interface-identities - Avoid adding null values to the supported-if-cap list JIRA: TRNSPRTPCE-596 Signed-off-by: Balagangadhar Bathula Change-Id: I7cf4df57daac4b11af5229a1617eabfc60bfcfee --- .../transportpce/common/mapping/MappingUtilsImpl.java | 4 ++++ .../transportpce/common/mapping/PortMappingVersion221.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java index 6f3608710..d3b6df0ff 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java @@ -31,6 +31,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1G import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If1GEODU0; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.If400GE; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCH; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU2EODU2E; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU2ODU2; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOCHOTU4ODU4; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.IfOTUCnODUCn; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability; @@ -57,6 +59,8 @@ public class MappingUtilsImpl implements MappingUtils { put("If100GE", If100GE.class); put("If10GE", If10GE.class); put("If1GE", If1GE.class); + put("IfOCHOTU2EODU2E", IfOCHOTU2EODU2E.class); + put("IfOCHOTU2ODU2", IfOCHOTU2ODU2.class); } }; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 73801e7b9..75cdf8d48 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -690,7 +690,6 @@ public class PortMappingVersion221 { nodesList.put(nodes.key(),nodes); Network network = new NetworkBuilder().setNodes(nodesList).build(); - final WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction(); InstanceIdentifier nodesIID = InstanceIdentifier.builder(Network.class).build(); writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodesIID, network); @@ -869,7 +868,9 @@ public class PortMappingVersion221 { List> supportedIntf = new ArrayList<>(); for (Class sup: port.getSupportedInterfaceCapability()) { - supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sup.getSimpleName())); + if (MappingUtilsImpl.convertSupIfCapa(sup.getSimpleName()) != null) { + supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sup.getSimpleName())); + } } mpBldr.setSupportedInterfaceCapability(supportedIntf); } -- 2.36.6