From aae91d432b783e3cf92ac50215bfb785c7efe873 Mon Sep 17 00:00:00 2001 From: manuedelf Date: Mon, 14 Dec 2020 10:55:05 +0100 Subject: [PATCH] New version of transportpce common types - Update grouping olm-renderer-input, adding min, max frequencies lower spectral slot number and higher spectral slot number - Update group olm-renderer-input, replacing slot-width with width - Fix center-freq unit - Update import in common, lighty, olm and renderer module - Update setPower in PowerMgmtImpl as now we use width instead of slot-width - Update variable name in method signature in OpenRoadmfactory, OpenRoadmInterface221 and DeviceRendererServiceImpl as now se use width instead of slot-width - Update createMCInterface and createNMCInterface as now we use width instead of slot-width - Update functional test test_flexgrid to be compliant with use of width instead of slot-width JIRA: TRNSPRTPCE-230 Signed-off-by: manuedelf Change-Id: I6103c7549aacf341201a45dbe1b79c94a469a706 --- ...transportpce-common-types@2020-12-11.yang} | 24 +++++++++- .../common/crossconnect/CrossConnect.java | 2 +- .../common/crossconnect/CrossConnectImpl.java | 2 +- .../crossconnect/CrossConnectImpl221.java | 2 +- .../common/fixedflex/GridConstant.java | 21 +++++++-- .../crossconnect/CrossConnectImpl221Test.java | 2 +- .../controllers/tpce/utils/TPCEUtils.java | 2 +- .../transportpce/olm/power/PowerMgmtImpl.java | 9 ++-- .../olm/service/OlmPowerServiceImpl.java | 4 +- .../transportpce/olm/util/OlmUtils121.java | 14 +++--- .../transportpce/olm/util/OlmUtils22.java | 8 ++-- .../olm/util/OlmPowerServiceRpcImplUtil.java | 6 +-- .../renderer/ModelMappingUtils.java | 10 ++--- .../transportpce/renderer/NodeLists.java | 2 +- .../OpenRoadmInterface221.java | 45 +++++-------------- .../OpenRoadmInterfaceFactory.java | 8 ++-- .../DeviceRendererServiceImpl.java | 30 ++++++------- .../DeviceRenderingResult.java | 4 +- .../OtnDeviceRendererServiceImpl.java | 8 ++-- .../OtnDeviceRenderingResult.java | 2 +- .../RendererServiceOperationsImpl.java | 4 +- .../tasks/DeviceRenderingRollbackTask.java | 4 +- .../tasks/DeviceRenderingTask.java | 2 +- .../RendererServiceOperationsImplTest.java | 2 +- .../renderer/utils/ServiceDataUtils.java | 6 +-- .../2.2.1/test_flex_grid.py | 6 +-- 26 files changed, 120 insertions(+), 109 deletions(-) rename api/src/main/yang/service_path/{transportpce-common-types@2020-06-15.yang => transportpce-common-types@2020-12-11.yang} (96%) diff --git a/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang b/api/src/main/yang/service_path/transportpce-common-types@2020-12-11.yang similarity index 96% rename from api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang rename to api/src/main/yang/service_path/transportpce-common-types@2020-12-11.yang index c0e0fb94f..0b5b760e3 100644 --- a/api/src/main/yang/service_path/transportpce-common-types@2020-06-15.yang +++ b/api/src/main/yang/service_path/transportpce-common-types@2020-12-11.yang @@ -15,6 +15,12 @@ module transportpce-common-types { revision-date 2018-10-19; } + revision 2020-12-11 { + description + "Update grouping olm-renderer-input, adding min, max frequencies + lower spectral slot number and higher spectral slot number + fix center-freq unit"; + } revision 2020-06-15 { description "Updated grouping olm-renderer-input to enable support for flex-grid"; @@ -419,11 +425,25 @@ module transportpce-common-types { type uint32; } leaf center-freq { - type org-openroadm-common-types:frequency-GHz; + type org-openroadm-common-types:frequency-THz; } - leaf slot-width { + leaf width { + description + " Width of nmc"; type org-openroadm-common-types:frequency-GHz; } + leaf min-freq { + type org-openroadm-common-types:frequency-THz; + } + leaf max-freq { + type org-openroadm-common-types:frequency-THz; + } + leaf lower-spectral-slot-number { + type uint32; + } + leaf higher-spectral-slot-number { + type uint32; + } list nodes { key "node-id"; ordered-by user; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java index a353459bc..1618b2a71 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; import java.util.List; import java.util.Optional; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes; public interface CrossConnect { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java index 3e9cee93d..5c3d905dc 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java @@ -18,7 +18,7 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.MappingUtils; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java index da378dbe3..8b49e71c8 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java @@ -39,7 +39,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnections; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java index 5b90e2a24..edf1d9808 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java @@ -10,6 +10,7 @@ package org.opendaylight.transportpce.common.fixedflex; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; +import java.math.BigDecimal; import java.util.Map; import org.opendaylight.transportpce.common.ServiceRateConstant; import org.opendaylight.transportpce.common.StringConstants; @@ -32,6 +33,11 @@ public final class GridConstant { public static final double CENTRAL_FREQUENCY = 193.1; public static final int NB_SLOTS_100G = 8; public static final int NB_SLOTS_400G = 14; + public static final BigDecimal WIDTH_80 = BigDecimal.valueOf(80); + public static final BigDecimal WIDTH_40 = BigDecimal.valueOf(40); + public static final BigDecimal SLOT_WIDTH_50 = BigDecimal.valueOf(50); + public static final BigDecimal SLOT_WIDTH_87_5 = BigDecimal.valueOf(87.5); + /** * Map for associate service type with nb slots. */ @@ -54,15 +60,22 @@ public final class GridConstant { public static final long IRRELEVANT_WAVELENGTH_NUMBER = 0; + /** + * Map to associate width format to slot width. + */ + public static final Map WIDTH_SLOT_WIDTH_MAP = Map.of( + WIDTH_40, SLOT_WIDTH_50, + WIDTH_80, SLOT_WIDTH_87_5); + private GridConstant() { } private static Table initFrequencyWidthTable() { Table frequencyWidthTable = HashBasedTable.create(); - frequencyWidthTable.put(ServiceRateConstant.RATE_100, ModulationFormat.DpQpsk, "40"); - frequencyWidthTable.put(ServiceRateConstant.RATE_200, ModulationFormat.DpQpsk, "80"); - frequencyWidthTable.put(ServiceRateConstant.RATE_300, ModulationFormat.DpQam8, "80"); - frequencyWidthTable.put(ServiceRateConstant.RATE_400, ModulationFormat.DpQam16, "80"); + frequencyWidthTable.put(ServiceRateConstant.RATE_100, ModulationFormat.DpQpsk, String.valueOf(WIDTH_40)); + frequencyWidthTable.put(ServiceRateConstant.RATE_200, ModulationFormat.DpQpsk, String.valueOf(WIDTH_80)); + frequencyWidthTable.put(ServiceRateConstant.RATE_300, ModulationFormat.DpQam8, String.valueOf(WIDTH_80)); + frequencyWidthTable.put(ServiceRateConstant.RATE_400, ModulationFormat.DpQam16, String.valueOf(WIDTH_80)); return frequencyWidthTable; } } diff --git a/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java b/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java index da91eab42..4a462d2ab 100644 --- a/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java +++ b/common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java @@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.C import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.OrgOpenroadmDevice; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnections; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes; import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java index e8905c766..7e0a02b8d 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java @@ -211,7 +211,7 @@ public final class TPCEUtils { .getInstance(), org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.$YangModuleInfoImpl .getInstance(), - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.$YangModuleInfoImpl.getInstance(), + org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.gnpy.gnpy.eqpt.config.rev181119.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.$YangModuleInfoImpl.getInstance(), diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java index f181e826a..b80ce889b 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmtImpl.java @@ -16,6 +16,7 @@ import java.util.Optional; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.olm.util.OlmUtils; @@ -266,10 +267,10 @@ public class PowerMgmtImpl implements PowerMgmt { } BigDecimal powerValue = spanLossTx.subtract(BigDecimal.valueOf(9)); powerValue = powerValue.min(BigDecimal.valueOf(2)); - // If slot-width is other than 50GHz then calculate PSD power value - if (input.getSlotWidth() != null && input.getSlotWidth().getValue().doubleValue() != 50) { - Double psdPower = 10 * Math.log(input.getSlotWidth().getValue().doubleValue() / 50); - powerValue = powerValue.add(new BigDecimal(psdPower)); + //we work at constant power spectral density (50 GHz channel width @-20dBm=37.5GHz) + // 87.5 GHz channel width @-20dBm=75GHz + if (input.getWidth() != null && GridConstant.WIDTH_80.equals(input.getWidth().getValue())) { + powerValue = powerValue.add(BigDecimal.valueOf(3)); } LOG.info("Power Value is {}", powerValue); try { diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index dbd63ded1..22fc04d97 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -75,8 +75,8 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfa import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifierBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.PmNamesEnum; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifierBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java index a8c85d4a3..bb75e65cc 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java @@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resour import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Shelf; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Srg; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifier; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,8 +72,8 @@ final class OlmUtils121 { Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (currentPmList.isPresent()) { String pmExtension = null; - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Location location = null; - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Direction direction = null; + org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Location location = null; + org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Direction direction = null; if (input.getPmExtension() != null) { pmExtension = input.getPmExtension(); } @@ -128,8 +128,8 @@ final class OlmUtils121 { List extractWantedMeasurements(CurrentPmlist currentPmList, ResourceTypeEnum resourceTypeEnum, ResourceIdentifier wantedResourceIdentifier,PmGranularity pmGranularity, PmNamesEnum pmNamesEnum, - String extension, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Location - location, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Direction direction) { + String extension, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Location + location, org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Direction direction) { List measurements = new ArrayList<>(); for (CurrentPm pm : currentPmList.nonnullCurrentPm().values()) { @@ -151,8 +151,8 @@ final class OlmUtils121 { private static List extractMeasurements(List measurementsFromDevice, PmNamesEnum pmNamesEnum, String extension, - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Location location, - org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Direction direction) { + org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Location location, + org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Direction direction) { List extractedMeasurements = new ArrayList<>(); List pmMeasurements = measurementsFromDevice; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java index ebeda1d67..a6289524b 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils22.java @@ -47,10 +47,10 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.current.pm.l import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.current.pm.list.CurrentPmEntryKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.current.pm.val.group.Measurement; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Direction; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.Location; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.PmNamesEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifier; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Direction; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.Location; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.PmNamesEnum; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java index ffcf482b0..1ba97d186 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmPowerServiceRpcImplUtil.java @@ -26,9 +26,9 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev20052 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifierBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifierBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.NodesBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java index ec0318cc6..cb4fdcec9 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -33,9 +33,9 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.atoz.direction.AToZ; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.ztoa.direction.ZToA; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.pce.resource.resource.resource.TerminationPoint; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.NodesKey; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.Uint32; @@ -125,7 +125,7 @@ public final class ModelMappingUtils { public static OtnServicePathInput rendererCreateOtnServiceInput(String serviceName, String serviceType, String serviceRate, PathDescription pathDescription, boolean asideToZside) { // If atoZ is set true use A-to-Z direction otherwise use Z-to-A - List nodes = + List nodes = new ArrayList<>(); NodeLists nodeLists = getNodesListAToZ(pathDescription.getAToZDirection().nonnullAToZ().values().iterator()); if (!asideToZside) { @@ -134,7 +134,7 @@ public final class ModelMappingUtils { LOG.info("These are node-lists {}, {}", nodeLists.getList(), nodeLists.getOlmList()); for (Nodes node: nodeLists.getList()) { nodes.add( - new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input + new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input .NodesBuilder() .setNodeId(node.getNodeId()) .setClientTp(node.getSrcTp()) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java index 947dc98fc..9a8fcadab 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NodeLists.java @@ -8,7 +8,7 @@ package org.opendaylight.transportpce.renderer; import java.util.List; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; public class NodeLists { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index 755343255..f86d2c556 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -18,11 +18,11 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface; import org.opendaylight.transportpce.common.fixedflex.FlexGridInterface; +import org.opendaylight.transportpce.common.fixedflex.GridConstant; 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.rev201012.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat; @@ -114,7 +114,7 @@ public class OpenRoadmInterface221 { } public List createFlexOCH(String nodeId, String logicalConnPoint, Long bitmapIndex, - BigDecimal centerFreq, BigDecimal slotWidth) + BigDecimal centerFreq, BigDecimal width) throws OpenRoadmInterfaceException { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -125,10 +125,10 @@ public class OpenRoadmInterface221 { List interfacesCreated = new ArrayList<>(); if (logicalConnPoint.contains("DEG")) { - String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, centerFreq, slotWidth, bitmapIndex); + String mcInterfaceCreated = createMCInterface(nodeId, logicalConnPoint, centerFreq, width, bitmapIndex); interfacesCreated.add(mcInterfaceCreated); } - String mcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, centerFreq, slotWidth, bitmapIndex); + String mcInterfaceCreated = createNMCInterface(nodeId, logicalConnPoint, centerFreq, width, bitmapIndex); interfacesCreated.add(mcInterfaceCreated); return interfacesCreated; } @@ -203,12 +203,12 @@ public class OpenRoadmInterface221 { } public String createMCInterface(String nodeId, String logicalConnPoint, - BigDecimal centerFrequency, BigDecimal slotWidth, Long bitmapIndex) + BigDecimal centerFrequency, BigDecimal width, Long bitmapIndex) throws OpenRoadmInterfaceException { // TODO : Check this method - - flexGrid = flexGrid.getFlexWaveMapping(centerFrequency.floatValue(), slotWidth.floatValue()); + flexGrid = flexGrid.getFlexWaveMapping(centerFrequency.floatValue(), + GridConstant.WIDTH_SLOT_WIDTH_MAP.get(width).floatValue()); Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -277,50 +277,27 @@ public class OpenRoadmInterface221 { } public String createNMCInterface(String nodeId, String logicalConnPoint, - BigDecimal centerFrequency, BigDecimal slotWidth, Long bitmapIndex) + BigDecimal centerFrequency, BigDecimal width, Long bitmapIndex) throws OpenRoadmInterfaceException { LOG.info("This is the central frequency {}", centerFrequency.floatValue()); - LOG.info("This is the slot-width {}", slotWidth.floatValue()); + LOG.info("This is the nmc width {}", width.floatValue()); // TODO : Check this method - flexGrid = flexGrid.getFlexWaveMapping(centerFrequency.floatValue(), slotWidth.floatValue()); Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException( String.format(MAPPING_ERROR_EXCEPTION_MESSAGE, nodeId, logicalConnPoint)); } - LOG.info("Freq Start {} and Freq End {} and center-Freq {}", flexGrid.getStart(), - flexGrid.getStop(),centerFrequency); //TODO : Check this method InterfaceBuilder nmcInterfaceBldr = createGenericInterfaceBuilder(portMap, NetworkMediaChannelConnectionTerminationPoint.class, logicalConnPoint + "-nmc" + "-" + bitmapIndex); if (logicalConnPoint.contains("DEG")) { nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + bitmapIndex); } - NmcCtpBuilder nmcCtpIfBuilder; - // From the logicalConnPoint, get the substring and for that associated substring find the mc-cap - String mcLcp = ""; - if (logicalConnPoint.contains("-PP")) { - mcLcp = logicalConnPoint.substring(0, logicalConnPoint.indexOf("-")) + "-PP"; - } - else if (logicalConnPoint.contains("-TTP")) { - mcLcp = logicalConnPoint.substring(0, logicalConnPoint.indexOf("-")) + "-TTP"; - } - McCapabilities mcCapabilities = portMapping.getMcCapbilities(nodeId, mcLcp); - if (mcCapabilities == null || mcCapabilities.getSlotWidthGranularity() == null - || mcCapabilities.getSlotWidthGranularity().getValue() == null) { - LOG.warn("Port mapping could not find {}", mcLcp); - LOG.warn("Check the port mapping to verify {}", mcLcp); - return nmcInterfaceBldr.getName(); - } - double slotWidthGran = mcCapabilities.getSlotWidthGranularity().getValue().doubleValue(); - // Dead-band is constant (Ref: WP) In GHz - double deadBand = 8; - double guardBand = Math.ceil(deadBand / slotWidthGran) * slotWidthGran; - nmcCtpIfBuilder = new NmcCtpBuilder() + NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder() .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(centerFrequency))) - .setWidth(FrequencyGHz.getDefaultInstance(String.valueOf(slotWidth.doubleValue() - guardBand))); + .setWidth(new FrequencyGHz(width)); // Create Interface1 type object required for adding as augmentation org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java index e07a5d0c3..6a69d90ea 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java @@ -51,14 +51,14 @@ public class OpenRoadmInterfaceFactory { } public List createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, - BigDecimal centerFreq, BigDecimal slotWidth) + BigDecimal centerFreq, BigDecimal width) throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: return openRoadmInterface121.createOpenRoadmOchInterface(nodeId, logicalConnPoint, waveNumber); case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: return openRoadmInterface221.createFlexOCH(nodeId, logicalConnPoint, waveNumber, - centerFreq, slotWidth); + centerFreq, width); default: return null; } @@ -87,14 +87,14 @@ public class OpenRoadmInterfaceFactory { } public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, - OchAttributes.ModulationFormat format, BigDecimal centerFreq, BigDecimal slotWidth) + OchAttributes.ModulationFormat format, BigDecimal centerFreq, BigDecimal width) throws OpenRoadmInterfaceException { switch (mappingUtils.getOpenRoadmVersion(nodeId)) { case StringConstants.OPENROADM_DEVICE_VERSION_1_2_1: return openRoadmInterface121.createOpenRoadmOchInterface(nodeId, logicalConnPoint, waveNumber, format); case StringConstants.OPENROADM_DEVICE_VERSION_2_2_1: return openRoadmInterface221.createOpenRoadmOchInterface(nodeId, logicalConnPoint, waveNumber, - centerFreq, slotWidth); + centerFreq, width); default: return null; } 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 69b46a6d6..d008e9260 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 @@ -66,10 +66,10 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.Service import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterfaceBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterfaceKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.OtnLinkType; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; @@ -135,21 +135,21 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { // TODO: need to update transportpce-common-types accordingly, to a more, generic-term Long waveNumber = input.getWaveNumber().toJava(); BigDecimal centerFreq = null; - BigDecimal slotWidth = null; + BigDecimal width = null; if (input.getCenterFreq() != null) { centerFreq = input.getCenterFreq().getValue(); } - if (input.getSlotWidth() != null) { - slotWidth = input.getSlotWidth().getValue(); + if (input.getWidth() != null) { + width = input.getWidth().getValue(); } String srcTp = node.getSrcTp(); String destTp = node.getDestTp(); if ((destTp != null) && destTp.contains(StringConstants.NETWORK_TOKEN)) { crossConnectFlag++; String supportingOchInterface; - if ((centerFreq != null) && (slotWidth != null)) { + if ((centerFreq != null) && (width != null)) { supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( - nodeId, destTp, waveNumber, ModulationFormat.DpQpsk, centerFreq, slotWidth); + nodeId, destTp, waveNumber, ModulationFormat.DpQpsk, centerFreq, width); } else { supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( @@ -186,9 +186,9 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { crossConnectFlag++; // create OpenRoadm Xponder Line Interfaces String supportingOchInterface; - if ((centerFreq != null) && (slotWidth != null)) { + if ((centerFreq != null) && (width != null)) { supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( - nodeId, srcTp, waveNumber, ModulationFormat.DpQpsk, centerFreq, slotWidth); + nodeId, srcTp, waveNumber, ModulationFormat.DpQpsk, centerFreq, width); } else { supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( @@ -219,10 +219,10 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } if ((srcTp != null) && (srcTp.contains(StringConstants.TTP_TOKEN) || srcTp.contains(StringConstants.PP_TOKEN))) { - if ((centerFreq != null) && (slotWidth != null)) { + if ((centerFreq != null) && (width != null)) { createdOchInterfaces.addAll( this.openRoadmInterfaceFactory - .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber, centerFreq, slotWidth)); + .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber, centerFreq, width)); } else { createdOchInterfaces.addAll( @@ -233,10 +233,10 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { if ((destTp != null) && (destTp.contains(StringConstants.TTP_TOKEN) || destTp.contains(StringConstants.PP_TOKEN))) { - if ((centerFreq != null) && (slotWidth != null)) { + if ((centerFreq != null) && (width != null)) { createdOchInterfaces.addAll( this.openRoadmInterfaceFactory - .createOpenRoadmOchInterface(nodeId, destTp, waveNumber, centerFreq, slotWidth)); + .createOpenRoadmOchInterface(nodeId, destTp, waveNumber, centerFreq, width)); } else { createdOchInterfaces.addAll( diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderingResult.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderingResult.java index 0062fa2bf..c49b9728e 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderingResult.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRenderingResult.java @@ -10,8 +10,8 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import java.util.Collections; import java.util.List; import org.opendaylight.transportpce.common.OperationResult; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; public final class DeviceRenderingResult extends OperationResult { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java index e92222df8..ec8ff8a82 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java @@ -30,10 +30,10 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.re import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.OtnServicePathOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.OtnServicePathOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.Interface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterfaceBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterfaceKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes; import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.OtnLinkType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRenderingResult.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRenderingResult.java index 273eb8403..9dd3b9864 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRenderingResult.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRenderingResult.java @@ -11,7 +11,7 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import java.util.Collections; import java.util.List; import org.opendaylight.transportpce.common.OperationResult; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterface; public final class OtnDeviceRenderingResult extends OperationResult { private final List renderedNodeInterfaces; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index 5af935595..908306967 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -64,8 +64,8 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.ServicePathList; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePaths; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePathsKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifierBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifierBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.Notification; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java index 3319911bb..b1d3b223a 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java @@ -17,8 +17,8 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.re import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.RendererRollbackInputBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.RendererRollbackOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.renderer.rollback.output.FailedToRollback; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.node.interfaces.NodeInterfaceKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java index 888e62956..128cfb40d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java @@ -15,7 +15,7 @@ import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererServ import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRenderingResult; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServicePathDirection; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.ServicePathOutput; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java index 7f984bb81..4bc98bc30 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java @@ -65,7 +65,7 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer. import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceImplementationRequestOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.get.pm.input.ResourceIdentifierBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.get.pm.input.ResourceIdentifierBuilder; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @Ignore diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java index 8da6f3460..bfa2edce1 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java @@ -45,9 +45,9 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.RxDirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.endpoint.sp.TxDirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.handler.header.ServiceHandlerHeaderBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.olm.renderer.input.NodesKey; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/tests/transportpce_tests/2.2.1/test_flex_grid.py b/tests/transportpce_tests/2.2.1/test_flex_grid.py index 4bf94c00a..e0c5872bd 100644 --- a/tests/transportpce_tests/2.2.1/test_flex_grid.py +++ b/tests/transportpce_tests/2.2.1/test_flex_grid.py @@ -119,7 +119,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): "transportpce-device-renderer:service-name": "testNMC-MC", "transportpce-device-renderer:wave-number": "2", "transportpce-device-renderer:center-freq": "196.05", - "transportpce-device-renderer:slot-width": "87.5", + "transportpce-device-renderer:width": "80", "transportpce-device-renderer:nodes": [ { "transportpce-device-renderer:node-id": "ROADM-D1", @@ -183,7 +183,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): # Check the mc-ttp max and min-freq self.assertEqual({ "frequency": 196.05, - "width": 75 + "width": 80 }, res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) time.sleep(3) @@ -202,7 +202,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): "supporting-port": "C1", "type": "org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint"}, **res['interface'][0]), res['interface'][0]) - self.assertEqual({"frequency": 196.05, "width": 75}, + self.assertEqual({"frequency": 196.05, "width": 80}, res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) time.sleep(3) -- 2.36.6