From af4ed1fe1d489698d70d874471968972507f7c6b Mon Sep 17 00:00:00 2001 From: Javier Errea Date: Mon, 11 Oct 2021 16:33:36 +0200 Subject: [PATCH] Fix null Supported CEP Qual. on TAPI node creation Added case for ODU0 supported interface in creation method of Supported CEP Qual. JIRA: TRNSPRTPCE-559 Signed-off-by: errea Change-Id: I715c710af6518865ce8c798ace40d1a0579d90ec --- .../tapi/topology/ConvertORTopoToTapiFullTopo.java | 9 +++++++++ .../tapi/topology/TapiNetworkModelServiceImpl.java | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java index ec7408eb0..5268055e0 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiFullTopo.java @@ -59,6 +59,8 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.tapi.context.ServiceInterfacePointKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPEGigE; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU0; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4; @@ -961,7 +963,14 @@ public class ConvertORTopoToTapiFullTopo { for (SupportedInterfaceCapability sic : sicList) { switch (lpn.getName()) { case "DSR": + case "ODU": switch (sic.getIfCapType().getSimpleName()) { + // TODO: it may be needed to add more cases clauses if the interface capabilities of a + // port are extended in the config file + case "If1GEODU0": + sclpqSet.add(ODUTYPEODU0.class); + sclpqSet.add(DIGITALSIGNALTYPEGigE.class); + break; case "If10GEODU2e": sclpqSet.add(ODUTYPEODU2E.class); sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class); 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 9ac731d78..eee0ba1fb 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 @@ -84,6 +84,8 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev18121 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210.context.ConnectivityContext; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPEGigE; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU0; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4; @@ -242,7 +244,6 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { // node transformation Map nodeMap = new HashMap<>(transformXpdrToTapiNode( nodeId, xpdrClMaps, xpdrNetMaps, mapping.getXponderType(), oorOduSwitchingPool)); - // add nodes and sips to tapi context mergeNodeinTopology(nodeMap); mergeSipsinContext(this.sipMap); @@ -742,7 +743,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { } private Map - createMSIP(int nb, LayerProtocolName layerProtocol, String tpid, String nodeid, + createMSIP(int nb, LayerProtocolName layerProtocol, String tpid, String nodeid, List> supportedInterfaceCapability, OperationalState operState, AdministrativeState adminState) { Map msipl = new HashMap<>(); @@ -1164,6 +1165,12 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { case "DSR": case "ODU": switch (sic.getIfCapType().getSimpleName()) { + // TODO: it may be needed to add more cases clauses if the interface capabilities of a + // port are extended in the config file + case "If1GEODU0": + sclpqList.add(ODUTYPEODU0.class); + sclpqList.add(DIGITALSIGNALTYPEGigE.class); + break; case "If10GEODU2e": sclpqList.add(ODUTYPEODU2E.class); sclpqList.add(DIGITALSIGNALTYPE10GigELAN.class); @@ -1253,7 +1260,7 @@ public class TapiNetworkModelServiceImpl implements TapiNetworkModelService { } catch (InterruptedException | ExecutionException e) { LOG.error("Error populating TAPI topology: ", e); } - LOG.info("Roadm Node added succesfully."); + LOG.info("Node added succesfully."); } private void mergeLinkinTopology(Map linkMap) { -- 2.36.6