From: Gilles Thouenon Date: Thu, 7 Apr 2022 11:55:04 +0000 (+0200) Subject: Remove SupportedIfCapability conversion from TAPI X-Git-Tag: 5.0.0~23^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=2ecdb0ea55a30a6ab2635a86734af8816bdb521f Remove SupportedIfCapability conversion from TAPI With change https://git.opendaylight.org/gerrit/c/transportpce/+/100135, conversions of SupportedIfCapability should have been removed. Remove useless conversion methods. JIRA: TRNSPRTPCE-644 Signed-off-by: Gilles Thouenon Change-Id: Ic4f885e4a8e45ff34496e27e20397dafc2975c53 --- diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java index 15263b06b..603612eab 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiNetworkModelServiceImpl.java @@ -39,15 +39,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.O import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.xpdr.tp.supported.interfaces.SupportedInterfaceCapabilityKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If100GEODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2e; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If1GE; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If1GEODU0; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCH; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.SupportedIfCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; @@ -504,7 +495,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); - ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + List> newSupIfCapList = + xpdrNetMaps.get(i).getSupportedInterfaceCapability(); OwnedNodeEdgePoint onep = createNep(nepUuid1, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, @@ -524,7 +516,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); - ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + List> newSupIfCapList = + xpdrNetMaps.get(i).getSupportedInterfaceCapability(); OwnedNodeEdgePoint onep = createNep(nepUuid2, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, @@ -544,7 +537,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); - ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + List> newSupIfCapList = + xpdrNetMaps.get(i).getSupportedInterfaceCapability(); OwnedNodeEdgePoint onep = createNep(nepUuid3, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), LayerProtocolName.PHOTONICMEDIA, LayerProtocolName.PHOTONICMEDIA, @@ -576,7 +570,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { name = nameBldr.setValueName("NodeEdgePoint_C").build(); } - ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrClMaps, i); + List> newSupIfCapList = + xpdrClMaps.get(i).getSupportedInterfaceCapability(); OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrClMaps.get(i).getLogicalConnectionPoint(), Map.of(name.key(), name), LayerProtocolName.DSR, LayerProtocolName.DSR, true, @@ -598,7 +593,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrNetMaps.get(i).getLogicalConnectionPoint())) .build(); - ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrNetMaps, i); + List> newSupIfCapList = + xpdrNetMaps.get(i).getSupportedInterfaceCapability(); OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrNetMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), @@ -621,7 +617,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { xpdrClMaps.get(i).getLogicalConnectionPoint())) .build(); - ArrayList> newSupIfCapList = convertSupIfCapaList(xpdrClMaps, i); + List> newSupIfCapList = + xpdrClMaps.get(i).getSupportedInterfaceCapability(); OwnedNodeEdgePoint onep = createNep(nepUuid, xpdrClMaps.get(i).getLogicalConnectionPoint(), Map.of(onedName.key(), onedName), @@ -1088,8 +1085,8 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { LOG.info("SIC list = {}", sicList); for (Class supInterCapa : sicList) { SupportedInterfaceCapability supIfCapa = new SupportedInterfaceCapabilityBuilder() - .withKey(new SupportedInterfaceCapabilityKey(convertSupIfCapa(supInterCapa))) - .setIfCapType(convertSupIfCapa(supInterCapa)) + .withKey(new SupportedInterfaceCapabilityKey(supInterCapa)) + .setIfCapType(supInterCapa) .build(); supIfMap.put(supIfCapa.key(), supIfCapa); } @@ -1171,33 +1168,6 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { return sclpqList; } - private static Class convertSupIfCapa(Class ifCapType) { - LOG.info("Interface Capability type = {}", ifCapType.getSimpleName()); - switch (ifCapType.getSimpleName()) { - case "If100GEODU4": - return If100GEODU4.class; - case "IfOCHOTU4ODU4": - return IfOCHOTU4ODU4.class; - case "If1GEODU0": - return If1GEODU0.class; - case "If10GEODU2e": - return If10GEODU2e.class; - case "If10GEODU2": - return If10GEODU2.class; - case "If100GE": - return If100GE.class; - case "If10GE": - return If10GE.class; - case "If1GE": - return If1GE.class; - case "IfOCH": - return IfOCH.class; - default: - return null; - } - } - private String getNodeType(XpdrNodeTypes xponderType) { switch (xponderType.getIntValue()) { case 1: @@ -1398,13 +1368,4 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { LOG.error("Error committing into datastore", e); } } - - private ArrayList> convertSupIfCapaList(List xpdrNetMaps, - int index) { - ArrayList> newSupIfCapList = new ArrayList>(); - xpdrNetMaps.get(index).getSupportedInterfaceCapability() - .forEach(a -> newSupIfCapList.add(xpdrNetMaps.get(index).getSupportedInterfaceCapability().get(0))); - return newSupIfCapList; - } }