transportpce.git
3 years agoRelease transportpce 2.2.0
jenkins-releng [Mon, 25 Jan 2021 12:45:18 +0000 (12:45 +0000)]
Release transportpce

3 years agoFix resource deletion issue in openroadm-topology 27/94427/1
Gilles Thouenon [Fri, 15 Jan 2021 10:56:02 +0000 (11:56 +0100)]
Fix resource deletion issue in openroadm-topology

JIRA: TRNSPRTPCE-383
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I99b759d9b0881f5aa1ce49864ae6f14afe361e12

3 years agobump lighty build to 13.1.0 11/94611/1
guillaume.lambert [Tue, 12 Jan 2021 08:35:56 +0000 (09:35 +0100)]
bump lighty build to 13.1.0

and fix some checkstyle warnings

NB:
lighty-core controller 13.1.0 is available on ODL nexus since 11/01/2021
https://nexus.opendaylight.org/content/repositories/public/io/lighty/core/lighty-controller/

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic4c3938f578444734895958442eb8c257d6028a9

3 years agoBump uptream dependencies to Al SR2 10/94610/1
Gilles Thouenon [Tue, 12 Jan 2021 07:59:35 +0000 (08:59 +0100)]
Bump uptream dependencies to Al SR2

- odlparent: 7.0.8
- mdsal: 6.0.8

JIRA: TRNSPRTPCE-357
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I673dc68abf6b2d4e3d4ae25ae9ad7266fa2ee828

3 years agoUpdate PCE-GNPy for flexgrid 95/94295/3
manuedelf [Mon, 21 Dec 2020 17:58:05 +0000 (18:58 +0100)]
Update PCE-GNPy for flexgrid

Remove use of wavelength to createPathConstraints in GnpyServiceImpl.
Add new method in GridUtils to get N value from frequency index.
Add new map in GridConstant to get spectral width slot number from rate.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I7d4aa898a72300db8963edc71c5fe451e1cd0a1d

3 years agoRefactor to remove useless wavelength reference 93/94293/5
manuedelf [Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)]
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

3 years agoUpdate connection and interface name 92/94292/4
manuedelf [Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)]
Update connection and interface name

As now we allocate frequencies instead of wavelength, change connection
and interface format name by replacing wavelength reference by lower
spectral slot number and higher spectral slot number.
For example: SRG1-PP1-TXRX-DEG1-TTP-TXRX-1 becomes
SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768
XPDR1-NETWORK1-1 becomes XPDR1-NETWORK1-761:768
- add lower and higher spectral slot number in signature methods of
crossconnect, olm, ModelMappinUtils, openroadminterface,
openroadmfactory
- add some log info
- update ServicePathInput and ServicePowerSetup in MappingUtils with
frequencies, spectral slot number and modulation format
- add new map to get slot width from service rate and modulation format
in GridConstant
- add methods in GridUtils to get lower and higher spectal slot number
from frequency
- update unit tests to take into account the new format name
- update functional tests to take into account the new format name

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I98f62491f2720a84d4fdc8bd189b0a123ab5f0cf

3 years agoUse slot width granularity in PCE 67/94267/5
manuedelf [Fri, 18 Dec 2020 07:26:27 +0000 (08:26 +0100)]
Use slot width granularity in PCE

Adding a new constraint in spectrum assignment for path calculation:
slot width granularity from mc capabilities. If for node, slot width
granularity is equals to 50GHz then spectrum assignment will be done
in fixed mode.
- Add new method to PceNode interface and its implementation to get
 slot width granularity.
- Add new method to MappingUtils to get mc capabilities for a node.
- Update unit tests

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I84356d45c1b8652a05fee0ef66aa53b50b1de5b0

3 years agoAdd methods to GridUtils 42/94242/9
manuedelf [Tue, 15 Dec 2020 07:17:39 +0000 (08:17 +0100)]
Add methods to GridUtils

Add getCentralFrequencyWithPrecision and computeCentralFrequency.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I2a451124344082dbf1fbb5bd5ff8e1d31e717c47

3 years agoNew version of transportpce common types 40/94240/9
manuedelf [Mon, 14 Dec 2020 09:55:05 +0000 (10:55 +0100)]
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 <emmanuelle.delfour@orange.com>
Change-Id: I6103c7549aacf341201a45dbe1b79c94a469a706

3 years agoNetworkmodel class renaming 39/94239/8
manuedelf [Fri, 11 Dec 2020 15:33:57 +0000 (16:33 +0100)]
Networkmodel class renaming

Rename NetworkModelWavelengthService, NetworkModelWavelengthServiceImpl
and NetworkModelWavelengthServiceTest to FrequenciesService,
FrequenciesServiceImpl and FrequenciesServiceTest as now we manage
frequencies. Update reference in blueprint file and classes using one of
those classes.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I78090ebab0b850ce78d4d8bf7a3ba43887a786bc

3 years agoNetwork model add enable wavelength unit test 38/94238/8
manuedelf [Fri, 11 Dec 2020 15:21:45 +0000 (16:21 +0100)]
Network model add enable wavelength unit test

- Enable and fix NetworkModelWavelengthServiceTest.
- Remove no more used PathDescriptionUtils test class
- Add a stub yang model for path-description in test-common to define
path description as a container and use it to parse
path_description.json test file. Using a json file avoid to have big
test classes to instantiate yang object.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: If843edb8116cb7ac60cffa3cd25544e9a251c88a

3 years agoTest-common module update 37/94237/8
manuedelf [Fri, 11 Dec 2020 15:04:34 +0000 (16:04 +0100)]
Test-common module update

Update test-common module to be able to deserialize json for yang object
that are not data object (notification, rpcdata).
- change parent to mdsal bing parent to be able to generate classes from
yang files : today converter can only parse json for data object not
notification or rpcdata. A temporary workaroud is to add stub model yang
data object.
- replace getBindingToNormalizedNodeCodec by getBindingDOMCodecServices
to have all the methods of BindingDOMCodecServices.
TODO: clean converter to use methods from BindingDOMCodecServices
and focus converter on parsing/writing json or xml file for data
object, notification or rpcdata.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I201060182ffe6434ffe837198d84e44c35d237c5

3 years agoFlexgrid for pce and network model 36/94236/8
manuedelf [Tue, 8 Dec 2020 17:41:21 +0000 (18:41 +0100)]
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

3 years agoMove TopologyDataUtils from tapi to test-common 35/94235/7
manuedelf [Thu, 10 Dec 2020 14:46:35 +0000 (15:46 +0100)]
Move TopologyDataUtils from tapi to test-common

Move TopologyDataUtils test class from tapi to test-common in order to
be able to reuse it in other maven modules. As this class is now in
src/main/java, fix spotbugs issues.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I29e987bff1c55ce3432c86728b4898f7ce1e38f9

3 years agoConstants for service type 34/94234/7
manuedelf [Wed, 2 Dec 2020 10:27:45 +0000 (11:27 +0100)]
Constants for service type

- add service type constants in common/StringConstant
- update classes with those new constants
- add Map in GridConstant to get spectral width slot number from
service type

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I6f21f5ea2ae06511e672b6bcfa223fa17dcc7501

3 years agoFrequency computation 33/94233/6
manuedelf [Tue, 1 Dec 2020 19:52:33 +0000 (20:52 +0100)]
Frequency computation

- Update GridUtils with 2 methods for computing wavelength number and
frequency.
- Add unit tests for those methods
- Add nb slots constants for 100G and 400G
- Add constant for central frequency

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I634d715fac05c52911dfc8158b4c5f0822883065

3 years agoPCE modification in order to prepare flexgrid 32/94232/6
manuedelf [Tue, 1 Dec 2020 07:46:23 +0000 (08:46 +0100)]
PCE modification in order to prepare flexgrid

- add version to PCeNode because spectrum assignment will depend on
node version
- add SpectrumAssignement class for result of spectrum assignment
- update functional pce and gnpy functional tests to manage version
through portmapping

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I02bd02742b25c4b2e2f5e0e710346e121a9dea47

3 years agoNew version of transportpce-pathDescription 31/94231/6
manuedelf [Mon, 30 Nov 2020 15:23:02 +0000 (16:23 +0100)]
New version of transportpce-pathDescription

- add aToZ-min-frequency and aToZ-max-frequency to aToZ-direction to
support flexgrid
- add ZToa-min-frequency and ZToa-max-frequency to zToA-direction to
support flexgrid
- update import of pathdescription in pce, renderer, servicehandler and
lighty

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I194922c4e0747ea6f35463bb035c42aa1ddd4fb4

3 years agoUpdate naming following flexgrid specification 30/94230/6
manuedelf [Mon, 30 Nov 2020 12:39:47 +0000 (13:39 +0100)]
Update naming following flexgrid specification

- set EFFECTIVE_BITS_VALUE to 768
- update data file samples, unit tests and functional tests
with this new value
- rename NB_CHANNELS to NB_OCTECTS as it's relevant in flexgrid
- remove FixedFridConstant as there is no more specific value

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ib6ad813fd8d3efbbba5b9c65aca6c1455081c573

3 years agoAdd getDataBroker to NetworkTransactionService 29/94229/6
manuedelf [Mon, 30 Nov 2020 09:02:17 +0000 (10:02 +0100)]
Add getDataBroker to NetworkTransactionService

In order to prepare flexgrid add getDataBroker method to be able to
retrieve version of PceOpticalNode.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ica0a27cdf7d4ded89b89642f70b0ca4677fe4fbd

3 years agoLight refactor on PceOpticalNode 28/94228/6
manuedelf [Wed, 25 Nov 2020 19:28:15 +0000 (20:28 +0100)]
Light refactor on PceOpticalNode

- remove useless class attributes
- simplify case SRGTXRXPP in initSrgTps method

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I6181506acfabecc92dc6527df91c3a6e5893ffe4

3 years agoMinimal refactor of renderer to prepare flexgrid 27/94227/6
manuedelf [Thu, 3 Dec 2020 18:07:08 +0000 (19:07 +0100)]
Minimal refactor of renderer to prepare flexgrid

- Move NetworkModelWavelengthService to networkmodel as topology update
  must be done by this module.
- NetworkModelWavelengthService is now invoked by a notification sent
  by service handler instead of being directly called by renderer
- Update constructors when NetworkModelWavelengthService is no more
  used.
- Remove no more used methods from RenderServiceOperations and its
  implementation.
- Update RenderListenerImpl from service handler to send notification
  for network model.
- Add a service listener to networkmodel to update frequencies map in
  topology.
- Minimal update to unit test after moving class
- Move MountPointStub from renderer to test-common
- Update blueprint files of render, service handler and network model

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I9dda66a301d92b74795ee5f239699bc2d11e9a8e

3 years agoMove NodeIdPair from renderer to common 26/94226/3
manuedelf [Thu, 3 Dec 2020 17:01:21 +0000 (18:01 +0100)]
Move NodeIdPair from renderer to common

In order to prepare light refactor on renderer, move NodeIdPair class
to common module.
Update import in class using this class.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I9d75ed192933a1752ed4ffa2c309147e40127047

3 years agoNew version of transportpce-servicehandler yang 25/94225/3
manuedelf [Thu, 3 Dec 2020 13:15:30 +0000 (14:15 +0100)]
New version of transportpce-servicehandler yang

- add path-description container in service-rpc-result-sh to prepare
renderer light refactor (move NetworkModelWavelengthService and its
implementation from renderer module to networkmodel module)
- update import in servicehandler module
- update import in lighty module

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I5bb6bc282801dfa5dd3cfc774ca8dbfa1edf87bb

3 years agoNew version of yang transportpce-renderer 24/94224/3
manuedelf [Thu, 3 Dec 2020 20:55:43 +0000 (21:55 +0100)]
New version of yang transportpce-renderer

- rename notification service-rpc-result-sp to
  notification renderer-rpc-result-sp
- add path description container to notification
- update import and class name in renderer, service handler and
  lighty

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: If20b12dae00116ceb41510f75b3e3128c65c5de7

3 years agooutsource flexgrid constants import in functests 40/94040/1
guillaume.lambert [Tue, 15 Dec 2020 16:48:03 +0000 (17:48 +0100)]
outsource flexgrid constants import in functests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibaac844844e7c2113b9f2ddde1e5879cedf862f1
(cherry picked from commit f4addc552d711cd1a6fb52fe2d27a92f86f95410)

3 years agoclean renderer NetworkModelWavelengthServiceImpl 39/94039/1
guillaume.lambert [Tue, 15 Dec 2020 16:28:41 +0000 (17:28 +0100)]
clean renderer NetworkModelWavelengthServiceImpl

- fix a few indentations
- optimize a few guard clauses
- use ternary operator for some trivial assignments

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I66c8fad967784f7f8be4373a7106c907382ebe61
(cherry picked from commit 47f0321523d7be8e24abcb65668d438182048e4e)

3 years agosplit checkPartnerPort method in PortMapping 38/94038/1
guillaume.lambert [Tue, 15 Dec 2020 14:54:04 +0000 (15:54 +0100)]
split checkPartnerPort method in PortMapping

this allows to reuse the intermediate checks in several other places
and to remove useless checks and to add protections.

JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8bdff51e7f15e516444ddb75a23e082e65ac11c4

3 years agoremove some useless null checks from portmapping 37/94037/1
Gilles Thouenon [Tue, 15 Dec 2020 13:52:34 +0000 (14:52 +0100)]
remove some useless null checks from portmapping

JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib4c389d24ae2cf56768d54b5871cbb9f6d8d84bc
(cherry picked from commit d059ad223a3893dcf30f5d7279299606ab906407)

3 years agoimprove partner-port check in createTtpPortMapping 36/94036/1
guillaume.lambert [Fri, 4 Dec 2020 21:10:19 +0000 (22:10 +0100)]
improve partner-port check in createTtpPortMapping

use the checkPartnerPort method inside createTtpPortMapping
such as done in createXpdrPortMapping or createPpPortMapping.

Beyond the overall coherency, this allows to perform some additional
(and maybe missing) null checking before accessing the related fields
and it also improves the log messages details.

JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe90c2d9755ff981762da0cc179e367882f3fa33
(cherry picked from commit d356e7d288af388774773eaea7ea64d66de9bab4)

3 years agoAlign and improve Portmapping versions Step 2 35/94035/1
guillaume.lambert [Thu, 26 Nov 2020 14:34:36 +0000 (15:34 +0100)]
Align and improve Portmapping versions Step 2

- optimize some pieces of code, mainly by improving checks orders,
  and sometimes by reversing the logic too.
- gather preliminary checks and use "continue" in loop rather than
  else-if-blocks to ease indentation and optimizations
- use (YANG) enums and switch/case rather than (else-)if-blocks
- add some new protections
- get rid of @SuppressWarnings linelength checks
- points with TODO comments potential code mutualizations or alignments
- introduce checkPartnerPort function in Portmapping 1.2.1

JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I91aadb74668cf7f4eb5689824dd33b92badcbe5f
(cherry picked from commit db6727f8b92fa3b683383af5fee1b2e33e0319d1)

3 years agouse ternary operators in portmapping 33/94033/1
guillaume.lambert [Fri, 27 Nov 2020 20:06:18 +0000 (21:06 +0100)]
use ternary operators in portmapping

use ternary operators for conditional assignments
rather than if-else-blocks

JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5eeb644ee0ecf80ab65872c7562bfa7ce9869431
(cherry picked from commit 853232de9e2c09133ddb7c1b91eda800fcf4d0e4)

3 years agomake honeynode download quieter 32/94032/1
guillaume.lambert [Fri, 4 Dec 2020 19:31:51 +0000 (20:31 +0100)]
make honeynode download quieter

and reduce logs size

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If74f5ff7a7bd8990fcb7c9ef209215ce93dd250f
(cherry picked from commit aa4c08b7f5a6b89260411916acd6fa5d314969ca)

3 years agomake honeynode and lighty builds unzip quieter 31/94031/1
guillaume.lambert [Fri, 4 Dec 2020 09:42:57 +0000 (10:42 +0100)]
make honeynode and lighty builds unzip quieter

and reduce logs size

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icef040b76d066c3c7fda783ce1a9ca09686a05b9
(cherry picked from commit c3247b9f03c010534e0787d0a53a26304a08566f)

3 years agoUpdate OTN E2E functional tests for 1GE 81/93981/7
Christophe Betoule [Mon, 30 Nov 2020 10:25:40 +0000 (11:25 +0100)]
Update OTN E2E functional tests for 1GE

JIRA: TRNSPRTPCE-285
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I073d6c557409096057225a61f5a1adf014ce4054

3 years agoPort capabilities handling in OTN topology 80/93980/7
Christophe Betoule [Wed, 25 Nov 2020 15:08:31 +0000 (16:08 +0100)]
Port capabilities handling in OTN topology

- replace hardcoded capabilities of a termination point by the ones
coming from device port (via portmapping)
- adapt pce consequently
- adapt functional tests consequently
- adapt UT consequently

JIRA: TRNSPRTPCE-287
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic38f2c5be6ad98eedbe201414a9e303895d893bb

3 years agoUpdate OTN configuration files for honeynode 79/93979/7
Christophe Betoule [Wed, 4 Nov 2020 11:26:42 +0000 (12:26 +0100)]
Update OTN configuration files for honeynode

- add a third xponder with a mux composed of 4 1GE
client ports and 1 100Gbps network port for otn
emulated nodes
- adapt functional tests consequently

Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Olivier Renais <olivier.renais@orange.com>
Change-Id: Ic978f2e67bfada13220c091a685747ce55616be1

3 years agoFix issue in PCE 78/93978/7
Christophe Betoule [Wed, 25 Nov 2020 15:06:58 +0000 (16:06 +0100)]
Fix issue in PCE

- manage the case when openroadm-topology contains multiple XPDR nodes
with the same supporting node-ref in openroadm-network
- update network topology for PCE func tests by adding tp-type for SGR
in complex openroadm-topology

Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I7212181d5eb84a56c13e0eb9ff918d46136c2ca2

3 years agoUpdate Honeynode simulator version 70/94070/1
manuedelf [Wed, 25 Nov 2020 19:36:12 +0000 (20:36 +0100)]
Update Honeynode simulator version

Following java version regexp fix in honeycomb-tpce.

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I2acf6caaf7e1ddefb5b0ccd75ab6b3dc9b9aeedb

3 years agoUpgrade to OpenROADM 7.1.0 network models 69/94069/1
manuedelf [Wed, 4 Nov 2020 08:10:37 +0000 (09:10 +0100)]
Upgrade to OpenROADM 7.1.0 network models

- Replace existing OpenROADM network models with version 7.1.0
- New version of transportpce-topology model to suppport 7.1.0 models
- common module: add constants to manage fixed and flex grid,
  add GridUtils class to init frequencies map
- update networkmodel module: update import version, update unit tests
- update renderer module: update import version, replace wavelength
  with frequencies map, update unit tests
- update olm module: update import version
- update pce module: update import version, replace wavelength with
  frequencies map (from 7.1 models), update unit tests and data test
  files
- update tapi module: update import version and data test file
- update lighty module: update import version
- update functional tests: update response check, add constants and
  functions to compute freq map, update data test files

Note that in pce, tapi modules and functional tests, there is
a major update in test data files: replacement of
available-wavelength
with avail-freq-maps which contains a base64 encoded 96 bytes
representing available frequency

JIRA: TRNSPRTPCE-259
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Iaf95e04232283f6adf08ef41b394c1cd0fca2354

3 years agoadd a documentation spellchecker tox profile 26/93826/3
guillaume.lambert [Fri, 13 Nov 2020 10:47:48 +0000 (11:47 +0100)]
add a documentation spellchecker tox profile

inspired from openStack
https://github.com/openstack/qa-specs/blob/master/tox.ini

https://doughellmann.com/blog/tag/sphinxcontrib-spelling/
https://pypi.org/project/sphinxcontrib-spelling/

JIRA: TRNSPRTPCE-349
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibaf9a74ab22f9aa60c656a3d5d5d955eecc68bbc

3 years agoOrdmodels - Remove generated code from source control 68/94068/1
manuedelf [Thu, 12 Nov 2020 15:44:13 +0000 (16:44 +0100)]
Ordmodels - Remove generated code from source control

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Icb9c057c6abc632280f532cc0be8600ceae5c7d9

3 years agoreformat api YANG models with pyang 67/94067/1
guillaume.lambert [Fri, 13 Nov 2020 10:09:49 +0000 (11:09 +0100)]
reformat api YANG models with pyang

using pyang 2.4.0 via pyangformat tox profile

JIRA: TRNSPRTPCE-338
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8896d0fd3f3c38376fdc33ebf60a07fcf8571fce

3 years agoadd pyang tox profiles to check/format api models 66/94066/1
guillaume.lambert [Thu, 12 Nov 2020 13:46:39 +0000 (14:46 +0100)]
add pyang tox profiles to check/format api models

JIRA: TRNSPRTPCE-338
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4035e21d6e763cff18a7791e49d5da81521a4740

3 years agofix DM_CONVERT_CASE SpotBugs issues in portmapping 65/94065/1
guillaume.lambert [Thu, 26 Nov 2020 14:26:42 +0000 (15:26 +0100)]
fix DM_CONVERT_CASE SpotBugs issues in portmapping

and get rid of the related @SuppressFBWarning
by using the default Locale with toUpperCase methods

JIRA: TRNSPRTPCE-356
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I05f1f7c173c1ed12ea2aa6bc8ba4bf5844acd0e0

3 years agoexplicit a cast in portmapping Version 2.2.1 64/94064/1
guillaume.lambert [Thu, 26 Nov 2020 14:17:20 +0000 (15:17 +0100)]
explicit a cast in portmapping Version 2.2.1

by ignoring an unchecked conversion warning

JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4c47d4ccfc75dd6c88a51fd86e03547ce2da0238

3 years agoAdd protection in portmapping connection-map loop 63/94063/1
Balagangadhar Bathula [Wed, 11 Nov 2020 20:02:06 +0000 (15:02 -0500)]
Add protection in portmapping connection-map loop

the port-mapping fails if the xponder subtree is absent
for the entries in connection-map.
This can happen with some devices buggy implementations.

JIRA: TRNSPRTPCE-348
Change-Id: If1a0cb15f8e55038485d75cbe9cdcd826d70c06b

3 years agobug fixes in Portmapping 7.1.0 62/94062/1
Gilles Thouenon [Tue, 24 Nov 2020 11:59:55 +0000 (12:59 +0100)]
bug fixes in Portmapping 7.1.0

- remove some useless namespaces inside java code
- in createMcCapDegreeObject and createMcCapSrgObject methods
  * add a null testing to avoid NPE
  * fix default treatment when McCapabilityProfileName is null or empty
- remove treatments on supported-interface-capability
  since this attribute is no more present in OpenROADM 7.1.0 ports.

JIRA: TRNSPRTPCE-337
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifdd3d07b88220f5f505be37286e21ca00fb09457

3 years agoAlign and improve Portmapping versions Step 1 61/94061/1
guillaume.lambert [Thu, 12 Nov 2020 10:20:03 +0000 (11:20 +0100)]
Align and improve Portmapping versions Step 1

- add FIXME comments to warn about code duplications at the beginning
  of the classes
- minor improvements and alignment over the 3 classes
- remove a useless argument from createNodeInfo versions 2.2.1 and 7.1.0
- point with a TODO comment in the version 1.2.1 createNodeInfo method
  the difference of protection there with the 2 other versions

JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I72ff9f05ca51caecb8ec41b6d2f666c6bf50ccbd

3 years agocreate a FnvUtils class in common mapping 60/94060/1
guillaume.lambert [Fri, 6 Nov 2020 20:36:08 +0000 (21:36 +0100)]
create a FnvUtils class in common mapping

This way, all the various PortMapping versions now call the same FNV-1
 64 bit function. The related common code is extracted from PortMapping
classes and mutualized in FnvUtils.

JIRA: TRNSPRTPCE-352
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1562ed2b919cb784f4c1b833af946568f0ac75e1

3 years agoPort-mapping for 7.1.0 models 59/94059/1
Balagangadhar Bathula [Sun, 1 Nov 2020 03:51:14 +0000 (23:51 -0400)]
Port-mapping for 7.1.0 models

adds support for XPDR and ROADM 7.1.0
- copied /pasted the portmapping221 classes to create 710 versions
- make needed adaptations
- declare the 710 bean in blueprint

JIRA: TRNSPRTPCE-337
Change-Id: I6a99b0c232d2ed037a5376d5b86f211d8f0e1020

3 years agoPort-mapping changes to support 7.1.0 models 58/94058/1
Balagangadhar Bathula [Fri, 30 Oct 2020 23:17:43 +0000 (19:17 -0400)]
Port-mapping changes to support 7.1.0 models

- upgrade portmapping API YANG files to use 7.1.0 models
- add in API pom.xml a dependency to ordm devices
  the attributes 'node-types' and 'xpdr-node-types' have moved to there.
- update java code to use the new portmapping model revision

JIRA: TRNSPRTPCE-256
Change-Id: I5ed81415cc80800b1fadf40ab4ec5ea204e12f49

3 years agoAdd OpenROADM 7.1.0 device and common models 57/94057/1
Balagangadhar Bathula [Thu, 10 Sep 2020 03:05:30 +0000 (23:05 -0400)]
Add OpenROADM 7.1.0 device and common models

- add OpenROADM device and common models version 7.1.0
  (previous models 1.2.1 and 2.2.1 are kept)
- keep only essential OpenConfig models used by OpenROADM
- add a NOTICE and an openconfig.LICENSE files in the jar ressources

OpenConfig YANG models are published under the Apache License version 2
a.k.a. ALv2 but they do not precise it in their description.
Though Alv2 allows redistribution under other licenses, it includes a
redistribution clause (4) that instructs to give any other recipients
of the work or the derivative works a copy of the original license.

JIRA: TRNSPRTPCE-225
Change-Id: Idebe4e20f0cb0554dd572c4c667d692c8a6dfcb5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
3 years agoRemove unused test resource files 56/94056/1
manuedelf [Wed, 4 Nov 2020 08:10:24 +0000 (09:10 +0100)]
Remove unused test resource files

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I41aa27121a634c03951c072d6fd3d5a034b623b3

3 years agoBump project version to Al SR2 17/94017/2
Gilles Thouenon [Thu, 3 Dec 2020 12:43:43 +0000 (13:43 +0100)]
Bump project version to Al SR2

JIRA: TRNSPRTPCE-357
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I255ec181d4199e0c498adeb26ddaed8be57d2734

3 years agoBump netconf dependencies to Al SR2 18/94018/2
Gilles Thouenon [Tue, 1 Dec 2020 17:21:39 +0000 (18:21 +0100)]
Bump netconf dependencies to Al SR2

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I48a5ed1b7ab6afb95c1aad617b3fa9c7e32ecc94

3 years agoUpdate developer-guide with TAPI section 18/93718/4
Gilles Thouenon [Tue, 10 Nov 2020 13:22:32 +0000 (14:22 +0100)]
Update developer-guide with TAPI section

Update documentation with updated information with regards to TAPI
feature. Explain TAPI abstraction done by TransportPCE.

JIRA: TRNSPRTPCE-267
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I44be5a0e37116ae7c009404a27667cb9ff848e65

3 years agoRewrite TAPI topology functional tests 62/93562/6
Gilles Thouenon [Tue, 27 Oct 2020 15:01:48 +0000 (16:01 +0100)]
Rewrite TAPI topology functional tests

- reactivate tapi functional tests in tox
- rewrite all the functional test suite in order to complement UTs

JIRA: TRNSPRTPCE-344
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I70008b844f8b15f98ff60968c7ba836ced5b1c00

3 years agoTAPI topology consolidation - step3 61/93561/6
Gilles Thouenon [Fri, 23 Oct 2020 10:24:33 +0000 (12:24 +0200)]
TAPI topology consolidation - step3

- transform the TAPI multi-layer topology abstraction to expose the
single 100G Transponder layer representing the connectivity between
100GE client ports of 100G Transponders connected to the ROADM
infrastructure. That gives a higher level of abstraction where the whole
otn-topology is abstracted into a single node with only its
corresponding onep.
- add UT to this specific topology abstraction

JIRA: TRNSPRTPCE-344
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I048ff512a74cc5246eafda2cfb8444280b4c29f1

3 years agoTAPI topology consolidation - step2 60/93560/6
Gilles Thouenon [Fri, 23 Oct 2020 07:56:30 +0000 (09:56 +0200)]
TAPI topology consolidation - step2

- integrate into T0 mulilayer TAPI topology the 100GE Transponders when
  their network ports are connected to the ROADM infra through
  xponder-input/output links
- manage the client to network port association for the 100GE
  transponder case
- adapt ConvertORTopoToTapiTopo and TapiTopologyImpl classes to add new
  UT for the 100G transponder use case
- rationalise samples of xml files to adapt portmapping and topologies
  to new test cases with 100GE transponder
- separate in a dedicated test file UT testing TAPI exceptions

JIRA: TRNSPRTPCE-344
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I665f2e6290c5a6be1628179a54fb35218c85739b

3 years agoTAPI topology consolidation 59/93559/5
Gilles Thouenon [Tue, 20 Oct 2020 16:07:49 +0000 (18:07 +0200)]
TAPI topology consolidation

Modify TAPI topology implementation to give an abstraction of
otn-topology for otn nodes whose network ports are connected to ROADM
through xponder-input/output links. Moreover, abstracts also the ROADM
infrastructure through a Photonic TAPI node. As for xponder-input/output
links, they are represented in by OMS links in the T0 multilayer TAPI
topology.
- add new method in ConvertORTopoToTapiTopo to create the ROADM
  infrastructure abstraction
- add new method in ConvertORTopoToTapiTopo to create OMS links
- create and manage a TapiTopologyException
- refacto TapiTopologyImpl to improve datastore readings
- refacto and improve UT for TapiTopologyImpl and
  ConvertORTopoToTapiTopo classes
- new samples of xml files to adapt portmapping and topologies to new
  TAPI topology code and test cases
- disable TAPI functional tests in tox

JIRA: TRNSPRTPCE-341
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I38904051cc3e183eda2586de7a104e46d56e39c8

3 years agoFix a method name typo in tapi module 88/93688/2
Gilles Thouenon [Sun, 8 Nov 2020 09:55:18 +0000 (10:55 +0100)]
Fix a method name typo in tapi module

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic573c9267457f31fef40b5e2f9659138627ab876

3 years agoMake AbstractTest as static class 58/93558/4
Gilles Thouenon [Tue, 20 Oct 2020 16:01:54 +0000 (18:01 +0200)]
Make AbstractTest as static class

Adapt AbstractTest to allow use of @BeforeClass for TAPI UT improvements

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I5f25e7ccf2d781f18822a6a7884030ed97abe9f3

3 years agoStrengthens independence between UTs in OLM 57/93557/4
Gilles Thouenon [Sat, 24 Oct 2020 07:27:49 +0000 (09:27 +0200)]
Strengthens independence between UTs in OLM

Use the adequate method of AbstracTest (getNewDataBroker())to be sure
that the same datastore context will not be shared between two UT.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie0e8a7aac6dd87f310c9e800eec83a77b24dfcf9

3 years agoPrecise Charsets in FileReader() methods 16/93516/1
manuedelf [Tue, 3 Nov 2020 09:02:44 +0000 (10:02 +0100)]
Precise Charsets in FileReader() methods

This is strongly advised and will be enforced after Silicon migration
and its switch to maven-modernizer-plugin.

JIRA: TRNSPRTPCE-345
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8f432106cee8a117979bd40e2b889d563ae44fb3

3 years agoremove odl-mdsal-broker useless dep from features 15/93515/1
manuedelf [Mon, 2 Nov 2020 13:35:14 +0000 (14:35 +0100)]
remove odl-mdsal-broker useless dep from features

Change-Id: I23fe0e3a66a1fd86034cc7268465af43296da4a1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
3 years agoforce lighty use in tox 10/93510/1
guillaume.lambert [Fri, 30 Oct 2020 12:26:59 +0000 (13:26 +0100)]
force lighty use in tox

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I849923ce4d50c02b5fd377acb29abbe5ed4ec75c
(cherry picked from commit b6b102950a565050d0b2678757be1e3c6973953b)

3 years agoadd a healthcheck to lighty startup in func tests 09/93509/1
guillaume.lambert [Fri, 30 Oct 2020 14:00:49 +0000 (15:00 +0100)]
add a healthcheck to lighty startup in func tests

JIRA: TRNSPRTPCE-294
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3267de8fde9eb9e1a34f51eb6cb3f7584873cbfa
(cherry picked from commit 93d42311876be9f4b03997fd2dd782f7893e45e3)

3 years agofix Lighty.io build 08/93508/1
guillaume.lambert [Wed, 30 Sep 2020 14:52:25 +0000 (16:52 +0200)]
fix Lighty.io build

- migrate to new lighty-core API
- migrate to new TPCE API
- fix java max heap sizes in start scripts

JIRA: TRNSPRTPCE-294
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id8906afd05ba7bee6468992d2d255b5db4b621e3
(cherry picked from commit 5e3675cf1ce1d119c758cb2d8513be591c1e6b78)

3 years agoService Handler optimizations and technical debt 20/93120/2
guillaume.lambert [Thu, 15 Oct 2020 14:19:56 +0000 (16:19 +0200)]
Service Handler optimizations and technical debt

- optimize some pieces of code
- add some protection on RpcStatus return Code treatments
  especially when a Pending or an unknown status is returned

JIRA: TRNSPRTPCE-342
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifd28578767a7c2c155e0f90ed04c736e5f104b3f
(cherry picked from commit 8c5929030801f571131b1aed25cfbc54f4f5269d)

3 years agobump deps to latest Al SR1 dev platform versions 18/93118/1
guillaume.lambert [Mon, 26 Oct 2020 21:53:29 +0000 (22:53 +0100)]
bump deps to latest Al SR1 dev platform versions

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I145c1f061f38d88440705eaf527cd5239c50186c

3 years agoremove some findbugs jsr305 useless dependencies 13/93113/1
guillaume.lambert [Wed, 21 Oct 2020 09:17:22 +0000 (11:17 +0200)]
remove some findbugs jsr305 useless dependencies

spotbugs-annotations dependency is now in odlparent pom and provides
already some of the needed material brought by this dependency before.

TODO: migrate remaining jsr305 dependencies to a more recent solution
https://groups.google.com/g/jenkinsci-dev/c/uE1wwtVi1W0

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6911be93f672b25ac07c85d7dfb25dd6695c8290
(cherry picked from commit 81635140b2cbf4e42a5d35c04b8f5e376334c9d4)

3 years agouse BOM in odl-transportpce feature pom 11/93111/1
guillaume.lambert [Fri, 16 Oct 2020 14:47:15 +0000 (16:47 +0200)]
use BOM in odl-transportpce feature pom

instead of specifying the right version each time

JIRA: TRNSPRTPCE-346
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I23c08594c6483d090d75f66f0c639528f22802ca
(cherry picked from commit a0136e44a34e87726e92f832a32cb343cf9393c4)

3 years agofix/rename transportpce-network-topology YANG file 10/93110/1
guillaume.lambert [Tue, 13 Oct 2020 13:58:55 +0000 (15:58 +0200)]
fix/rename transportpce-network-topology YANG file

The filename was inconsistent with its namespace and prefix i.e.
transportpce-topology and tpce-topology.

JIRA: TRNSPRTPCE-340
Change-Id: Ica44bef1026842de8258dbb77e69d37f3bd89716
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit d387a85da6807f60a1eace010ceeecff440a0512)

3 years agoClean up API YANG models with the help of pyang 09/93109/1
Balagangadhar Bathula [Wed, 7 Oct 2020 16:00:48 +0000 (12:00 -0400)]
Clean up API YANG models with the help of pyang

This addresses the following pyang generated warnings
 - Remove any unused imports
 - Add revision dates to the imports
 - Order the revisions
 - Fix a warning in org-openroadm-resource (MSA related)

JIRA: TRNSPRTPCE-340
Change-Id: I37dae25c3a54d5245a84b209b0f1f1981799fe5a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 722de361b95b7aa8c199b774653e67c78e661adb)

3 years agorename API transportpce-renderer-device YANG file 08/93108/1
Balagangadhar Bathula [Wed, 7 Oct 2020 15:31:24 +0000 (11:31 -0400)]
rename API transportpce-renderer-device YANG file

and modify java code / imports accordingly.

The filename was inconsistent with its namespace and prefix i.e.
transportpce-device-renderer.

JIRA: TRNSPRTPCE-340
Change-Id: I088813daa46472745400cd4cdd764061c1e20444
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 70443644ba70b8634539ca58e94d61ab57fc2c22)

3 years agofix a bug in ServiceHandler ModelMappingUtil 62/92962/1
Balagangadhar Bathula [Wed, 7 Oct 2020 14:37:15 +0000 (10:37 -0400)]
fix a bug in ServiceHandler ModelMappingUtil

OTU, ODU and CLLI are wrongly assigned twice.

JIRA: TRNSPRTPCE-339
Change-Id: I3277d7d97bf43be2ddfd501d64d827107e84ce28
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 6b2681f7128d84c1f602f6a3cdd0142e2bbec858)

3 years agoTechnical debt - fix SH deprecated warnings 11/93011/6
manuedelf [Fri, 9 Oct 2020 18:42:54 +0000 (20:42 +0200)]
Technical debt - fix SH deprecated warnings

JIRA: TRNSPRTPCE-334
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ia7ed580e7c15050cbffd75be433aef5806097e2c

3 years agoTechnical debt - Service handler Sonar issues 07/93007/4
manuedelf [Fri, 9 Oct 2020 13:30:06 +0000 (15:30 +0200)]
Technical debt - Service handler Sonar issues

JIRA: TRNSPRTPCE-214
Change-Id: Ibdae3184f6f261e371db8d12e4719b105ca61705
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
3 years agoBump to Aluminium SR1 dev version 21/93021/5
manuedelf [Mon, 12 Oct 2020 09:43:30 +0000 (11:43 +0200)]
Bump to Aluminium SR1 dev version

JIRA: TRNSPRTPCE-336

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ie16a4d93061a0e92cc24cb39d150c569b09345d6

3 years agoMerge "Fix tpce internal Yang syntax" into stable/aluminium
Gilles Thouenon [Tue, 13 Oct 2020 08:46:52 +0000 (08:46 +0000)]
Merge "Fix tpce internal Yang syntax" into stable/aluminium

3 years agoFix tpce internal Yang syntax 25/93025/2
manuedelf [Mon, 12 Oct 2020 12:36:26 +0000 (14:36 +0200)]
Fix tpce internal Yang syntax

- garbage/superflous "}" are no more tolerated by yangtools

JIRA: TRNSPRTPCE-336

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I4d9ec5ffc20a9daca4487a3e783e0183b517fbe3

3 years agorationalize inventory code 52/92952/1
guillaume.lambert [Thu, 17 Sep 2020 08:07:21 +0000 (10:07 +0200)]
rationalize inventory code

JIRA: TRNSPRTPCE-207
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3e3f0e9535b98652ac3643151f68dd02ee0e21a4
(cherry picked from commit ebfb35225a621f0e4e19616057ee0ad870618009)

3 years agoMerge "Technical debt - Fix PCE sonar issues" into stable/aluminium
Guillaume Lambert [Mon, 12 Oct 2020 09:17:30 +0000 (09:17 +0000)]
Merge "Technical debt - Fix PCE sonar issues" into stable/aluminium

3 years agoTechnical debt - Fix PCE sonar issues 00/93000/5
manuedelf [Fri, 9 Oct 2020 09:47:46 +0000 (11:47 +0200)]
Technical debt - Fix PCE sonar issues

JIRA: TRNSPRTPCE-274
Change-Id: If50936c2cf75be450212f9f568125cfb6033a0d8
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
3 years agoTechnical debt - fix Renderer sonar issues 94/92994/5
manuedelf [Thu, 8 Oct 2020 11:46:44 +0000 (13:46 +0200)]
Technical debt - fix Renderer sonar issues

JIRA: TRNSPRTPCE-213
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iadbd280f814b3ea7e9b8c55740bdb4a8698cdfc4

3 years agoAdd OTN links support in TAPI topology 67/92967/6
Gilles Thouenon [Wed, 7 Oct 2020 15:48:01 +0000 (17:48 +0200)]
Add OTN links support in TAPI topology

- Add OTN OTU4 and ODU4 links in TAPI topology. Replace 2
  unidirectional OTU4 links in OpenROADM otn-topology by a single
  bidirectional Photonics link in TAPI. In the same way, replace 2
  unidirectional ODU4 links in OpenROADM otn-topology by a single
  bidirectional ODU link in TAPI topology
- add new Unitary tests for TAPI otn links
- add a new sample OpenROADM otn-topology XML file
  containing more nodes with OTN links as input for UTs
- adapt UUID creation to take into account new OTN topology context
- wait that the XML input file has been written in datastore before
  getting topology from it in UT

JIRA: TRNSPRTPCE-185
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I5c762f30d3bd290b98d04d7f960fb1077be3a111

3 years agoFix bug in TAPI for transitional links 15/92915/2
Gilles Thouenon [Tue, 6 Oct 2020 08:58:09 +0000 (10:58 +0200)]
Fix bug in TAPI for transitional links

UUID of transitional links were identical for SPDR-SA1 and SPDR-SC1.
To solve it, we can consider the node id to create a per-device unique
UUID.

JIRA: TRNSPRTPCE-333
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I00943607bdc553bfdaef045cb8fad03a8a80efd8

3 years agoMerge "Reactive remaining Junits tests for Al migration" into stable/aluminium
Guillaume Lambert [Sat, 3 Oct 2020 16:15:13 +0000 (16:15 +0000)]
Merge "Reactive remaining Junits tests for Al migration" into stable/aluminium

3 years agoMerge "Migrate to Al and reactivate some Junit tests" into stable/aluminium
Guillaume Lambert [Sat, 3 Oct 2020 16:14:22 +0000 (16:14 +0000)]
Merge "Migrate to Al and reactivate some Junit tests" into stable/aluminium

3 years agoReactive remaining Junits tests for Al migration 04/92704/1
manuedelf [Tue, 15 Sep 2020 14:31:11 +0000 (16:31 +0200)]
Reactive remaining Junits tests for Al migration

JIRA: TRNSPRTPCE-305
Change-Id: I0e684f389b4c9f4e0924d0cfef244992d0da8ca5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 2df235e965f3b4ff99f2e7bfc5a2911869c97c03)

3 years agoMigrate to Al and reactivate some Junit tests 03/92703/1
manuedelf [Tue, 15 Sep 2020 14:31:11 +0000 (16:31 +0200)]
Migrate to Al and reactivate some Junit tests

  - Use of BindingDOMCodecServices in DataStoreContext
  - remove @Ignore decorator and fix unit tests when needed

This commit reintroduces the import of mdsal.binding.dom.codec.impl
.BindingCodecContext in common/src/main/[..]/DataStoreContextImpl.java.
This dependency was preventing karaf from starting up correctly and was
removed previously in commit 243c08d8b7ad90b0cbaec76a33a639d6fa96f5c8

Since DataStoreContext is no more used outside of the test scope,
common/src/main/[..]/DataStoreContext.java and friends have been moved
into test-common before reintroducing this import.
They are now only used in test scope / build time.
This way, the karaf start-up problem is avoided.

JIRA: TRNSPRTPCE-305
Change-Id: I246a9d58879be047c470f8a683993bc81d3a54a3
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 01496e26615d33be24a427e0f4d12a161acbe064)

3 years agodo not explicit serialVersionUID anymore 97/92697/1
guillaume.lambert [Tue, 22 Sep 2020 08:11:12 +0000 (10:11 +0200)]
do not explicit serialVersionUID anymore

A new SpotBug rule has been introduced in odlparent Aluminium and
suggests to explicit the serialVersionUID in serializable classes to
avoid compilers interoperability problems due to a Java implementation
design flaw.

If this is useful in a few situations (rare today), this also means that
theorically developers must maintain this field and increment it across
classes incompatible versions.
Practically, this step is often forgotten, paving the way to more
serious problems.
Since the situation here does not require it, it is healthier to simply
ignore this (soon obsolete?) recommendation.

For more details:
git log pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID
https://moi.vonos.net/java/serialization-synthetic/
https://rules.sonarsource.com/java/RSPEC-4926
https://www.vojtechruzicka.com/explicitly-declare-serialversionuid/
https://www.infoworld.com/article/3275924/oracle-plans-to-dump-risky-java-serialization.html

JIRA: TRNSPRTPCE-292
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4e36134061104d912a75f3a578d43ca0bc17ab1f
(cherry picked from commit a00f3ee60b16735f27af765a5bf357c56a091bc5)

3 years agoMove common DataStoreContext and co to test-common 93/92693/1
manuedelf [Tue, 15 Sep 2020 14:31:11 +0000 (16:31 +0200)]
Move common DataStoreContext and co to test-common

Before Al migration, DataStoreContext was used only by GNPy at run-time.
As GNPy does not use it anymore, move it to test scope by putting it in
the test-common module.

JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8ea8afbdab56de08c594c9edb55543cb8d1901b7
(cherry picked from commit b6ad4ae8cec0ad9e3fa35b1e6e3153f045a97bf1)

3 years agoMerge "Test suite for flex-grid support" into stable/aluminium
Guillaume Lambert [Fri, 25 Sep 2020 09:34:53 +0000 (09:34 +0000)]
Merge "Test suite for flex-grid support" into stable/aluminium

3 years agoMerge changes from topic "pylint-issues-stable/aluminium" into stable/aluminium
Guillaume Lambert [Fri, 25 Sep 2020 08:40:35 +0000 (08:40 +0000)]
Merge changes from topic "pylint-issues-stable/aluminium" into stable/aluminium

* changes:
  use dict instead of many elif in functional tests
  convert test_topoPortmapping.py to snake case
  remove dead code from topology221 test
  fix some pylint issues
  fix superflous parenthesis pointed out by pylint
  fix functional tests linelength pylint issues
  fix few bugs and unused issues in functional tests
  fix pylint configuration
  run autopep8 on functional tests

3 years agouse dict instead of many elif in functional tests 91/92691/1
guillaume.lambert [Wed, 9 Sep 2020 10:06:26 +0000 (12:06 +0200)]
use dict instead of many elif in functional tests

and add some forgotten tests in topology tests

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic0d0e00931527ecf421914fd3bf2048504758f49
(cherry picked from commit 868e64eafd77ca3e0238a41cb0c062fd777b9564)

3 years agoconvert test_topoPortmapping.py to snake case 90/92690/1
guillaume.lambert [Thu, 10 Sep 2020 09:46:42 +0000 (11:46 +0200)]
convert test_topoPortmapping.py to snake case

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I815871de4609c724cffe5f7ccdbcbfa3cab70de9
(cherry picked from commit 9ba30212c854491c400b3702d481013f5b262880)

3 years agoremove dead code from topology221 test 89/92689/1
guillaume.lambert [Thu, 10 Sep 2020 09:42:53 +0000 (11:42 +0200)]
remove dead code from topology221 test

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3657ce7a6af97b8043577c38cd579df352d32718
(cherry picked from commit f3259f5e419dea1bd0f295201c5c044ed1a6c951)