Refactor to remove useless wavelength reference 64/94564/8
authormanuedelf <emmanuelle.delfour@orange.com>
Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)
committermanuedelf <emmanuelle.delfour@orange.com>
Tue, 12 Jan 2021 08:51:40 +0000 (09:51 +0100)
commitbf047c9d77aa191d98749aa95b683f517aeea542
tree39c3a80b3aebc2afbd6087a481738b50e1f3b49e
parent3cb0866be6bc8b477849b6ad61e152e565254058
Refactor to remove useless wavelength reference

As now we are using frequencies and all information about allocated
frequencies are provided by pce, refactor code to remove useless
wavelength references.
- in order to avoid too much parameters in methods from renderer and
common, add a new class SpectrumInformation which contains width, min
freq, max freq, wavelength number (for 1.2.1), center freq, lower
spectral slot number, higher spectral slot number. This class also
contains a method to generate connection name and lcp name from
parameters
- update constructors of crossconnect and openroadminterface by
replacing parameters like width center freq, lower and higher spectral
slot number with SpectrumInformation parameter
- remove duplicated method
- remove FixedFlex and Flexgrid as they are no more needed.
- rename GRID_FREQUENCY_PRECISION to FIXED_GRID_FREQUENCY_PRECISION and
add FLEX_GRID_FREQUENCY_PRECISION as precision is not the same for fixed
and flex grid
- add initSpectrumInformationFromServicePathInput in GridUtils to
instanciate SpectrumInformation object from ServicePathInput
- update blueprint files
- update unit tests to pass the compilation (no refactoring done here to
improve unit tests)
- update test_flexgrid, set wavelength number to 0 (as we are in
flexgrid mode) and slot number to be coherent with frequencies

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I6982ffecbba0ab84dde224698a2673588c906845
34 files changed:
common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnect.java
common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java
common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221.java
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java [deleted file]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexInterface.java [deleted file]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FlexGridImpl.java [deleted file]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FlexGridInterface.java [deleted file]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/SpectrumInformation.java [new file with mode: 0644]
common/src/main/resources/OSGI-INF/blueprint/common-blueprint.xml
common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121Test.java
common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl221Test.java
common/src/test/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImplTest.java
common/src/test/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImplTest.java [deleted file]
common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java
lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/ServiceHandlerListener.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java
renderer/src/main/resources/OSGI-INF/blueprint/renderer-blueprint.xml
renderer/src/test/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadMInterface221Test.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java
renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java
tests/transportpce_tests/2.2.1/test_flex_grid.py