Flexgrid for pce and network model 56/94556/7
authormanuedelf <emmanuelle.delfour@orange.com>
Tue, 8 Dec 2020 17:41:21 +0000 (18:41 +0100)
committermanuedelf <emmanuelle.delfour@orange.com>
Sat, 9 Jan 2021 14:41:35 +0000 (15:41 +0100)
commit7e175bf72bc28db4299b1fd76e6d01bdb0854d0f
tree8dd6f64bac2bf4e784acdbef9aa16f24128aab46
parent90f7343d69fd5629f28eddae873ab3d2571ec46a
Flexgrid for pce and network model

- add ServiceRateConstant class in common module to centralize service
rate Uint32 format.
- update GridConstant with maps (service type and nb slots, service rate
and modulation format, service rate-modulation format and frequency
width) and constant for irrelevant wavelength number.
- add methods in GridUtils.
- rename methods in NetworkModelWaveLengthService to be compliant with
frequencies.
- disable NetworkModelWaveLengthService unit tests.
- move some methods from NetworkModelWaveLengthServiceImpl to
OpenRoadmTopology util class in network model.
- update pce with flexgrid spectrum assignment computation.
- update pce unit tests.
- add getBitSetData method to PceNode and remove checkWL method.
- update PceNode implementations (PceOtnNode and PceOpticalNode).
- rename methods in pce to be compliant with frequencies.
- update some log messages to be coherent with frequencies.
- add minFrequency and maxFrequency to PceResult.
- update functional tests.
- update topology test files set freq map value to have the smallest
lambda on the higher index of the freqmap.

About "disable NetworkModelWaveLengthService unit tests":
some updates are needed in test-common: path-description is a
grouping and is used only in notification. DataObjectConverter converts
only data so to be able to Deserialize path-description from json file
in unit tests, a solution could be to add a dummy yang model in
test-common with container using path-description.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ie22761e535e0669f614ac18ea801b5dac75dd362
33 files changed:
common/src/main/java/org/opendaylight/transportpce/common/ServiceRateConstant.java [new file with mode: 0644]
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
common/src/test/java/org/opendaylight/transportpce/common/fixedflex/GridUtilsTest.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/ServiceHandlerListener.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthService.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceImpl.java
networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceFreeTest.java [deleted file]
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceUseTest.java [deleted file]
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceTest.java [new file with mode: 0644]
networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/WaveLengthServiceUtils.java [deleted file]
networkmodel/src/test/resources/openroadm-topology.xml [new file with mode: 0644]
networkmodel/src/test/resources/path_description.json [new file with mode: 0644]
pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java
pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java
pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResultTest.java
tests/sample_configs/NW-for-test-5-4.xml
tests/sample_configs/NW-simple-topology.xml
tests/sample_configs/gnpy/openroadmTopology.json
tests/transportpce_tests/1.2.1/test_end2end.py
tests/transportpce_tests/2.2.1/test_end2end.py
tests/transportpce_tests/2.2.1/test_otn_end2end.py
tests/transportpce_tests/common/flexgrid_utils.py [deleted file]