transportpce.git
3 years agoAdd a portmapping method to create Xpdr LCP names 80/94880/4
guillaume.lambert [Wed, 3 Feb 2021 12:23:38 +0000 (13:23 +0100)]
Add a portmapping method to create Xpdr LCP names

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

3 years agoImprove portmapping LCP names creation process 10/95010/2
guillaume.lambert [Wed, 3 Feb 2021 12:15:52 +0000 (13:15 +0100)]
Improve portmapping LCP names creation process

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

3 years agoAdd a portmapping method to map degrees 72/94972/3
guillaume.lambert [Tue, 2 Feb 2021 20:02:33 +0000 (21:02 +0100)]
Add a portmapping method to map degrees

that can be easily reused in the other methods
- use getDegreesMap() to retrieve the list of Degrees
- getPerDegreePorts() to generate a map of ports per degree
- remove unused argument from some methods

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

3 years agoBump odlparent to 8.1.0 and mdsal to 7.0.5 26/94926/2
Gilles Thouenon [Mon, 1 Feb 2021 10:10:02 +0000 (11:10 +0100)]
Bump odlparent to 8.1.0 and mdsal to 7.0.5

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

3 years agoNetworkModelListener: handling TopologyUpdates 15/93915/38
Errea Moreno, Javier [Fri, 18 Dec 2020 13:45:03 +0000 (14:45 +0100)]
NetworkModelListener: handling TopologyUpdates

- Update of service state affected by topology update
- Added state to PathDescription elements
- Update PathDescription according to topology update notification
- Fixed test_pce.py by adding state to link in tests 21 & 23

JIRA: TRNSPRTPCE-363
Change-Id: Ic7e6a2f2abdfb70361ac251e3d44dc8505910409
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoStateful PCE module 87/93887/30
Errea Moreno, Javier [Thu, 19 Nov 2020 11:15:27 +0000 (12:15 +0100)]
Stateful PCE module

- PCE changes to consider link & node states on path & graph calculation
- Modify PCE tests to include admin & oper state in node & link creation
- Added link and node states in topologies sample config xml file
- Set states for nodes, links and TPs in otn-topology to fix TAPI tests

JIRA: TRNSPRTPCE-361
Change-Id: I34db90b2fc3bf5d176f3a5aeb5dc83e9bfe66432
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoNetworkModelListener implementation (interface D) 81/93881/24
Errea Moreno, Javier [Wed, 18 Nov 2020 12:49:09 +0000 (13:49 +0100)]
NetworkModelListener implementation (interface D)

- TopologyListener in ServiceHandler to receive topology notifications
- Send notifications from NetworkModel to ServiceHandler
- Edited Rdm2CpdrLink.java to add states to links (forgotten before)

JIRA: TRNSPRTPCE-359
Change-Id: I56a4b2eb8a2bac2f7dd877821fca5aee0c27e500
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoInterface D creation. NetworkModel->ServiceHandler 47/93847/25
Errea Moreno, Javier [Mon, 16 Nov 2020 17:50:20 +0000 (18:50 +0100)]
Interface D creation. NetworkModel->ServiceHandler

- Added common-ord-topology-types.yang and networkmodel.yang
- Created empty NetworkModelListener in Service Handler module.
- Initialization of Network model listener.
- Modified servicehandler blueprint and ServicehandlerImplTest.java
- Added models to TPCEUtils.java (lighty)
- Added NetworkModelListenerImpl to the controller start up process

JIRA: TRNSPRTPCE-359
Change-Id: I25e7b3f28741386c3d2b38ad49a04d7d4b304597
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoUpdate openroadm-topology layer based on NETCONF event 33/93833/24
Errea Moreno, Javier [Fri, 13 Nov 2020 16:51:15 +0000 (17:51 +0100)]
Update openroadm-topology layer based on NETCONF event

- UpdateOpenRoadmNetworkTopology in NetworkModelServiceImpl.java
- Added getTpofNode function to OrdLink.java to add state to R2R links
- Added call to the update function in DeviceListener.java
- Fix relation chain issues

JIRA: TRNSPRTPCE-358
Change-Id: I36558408c21fd7f598711eeb8acaab28c8f5c58a
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoStateful OpenROADM topology layer 22/93822/23
Errea Moreno, Javier [Fri, 13 Nov 2020 09:25:30 +0000 (10:25 +0100)]
Stateful OpenROADM topology layer

- On topology population, states of  nodes & links are included
- Modified test_topology.py to take into account admin and oper states

JIRA: TRNSPRTPCE-351
Change-Id: If2c8d2f110c851e612c78d7095f514f5e26c1ac0
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoNETCONF event handling 11/93811/24
Errea Moreno, Javier [Thu, 12 Nov 2020 14:07:04 +0000 (15:07 +0100)]
NETCONF event handling

- DeviceListener processes NETCONF events from CircuitPack change

JIRA: TRNSPRTPCE-350
Change-Id: I20a8cf392dbf2f80560a7aaa341a1eef6d9c91bb
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoFix resource deletion issue in openroadm-topology 41/94641/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 agoUpdate PCE-GNPy for flexgrid 65/94565/8
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 64/94564/8
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 63/94563/8
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 62/94562/8
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 61/94561/8
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 60/94560/8
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 59/94559/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 58/94558/7
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 57/94557/7
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 56/94556/7
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 55/94555/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 54/94554/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 53/94553/7
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 52/94552/7
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 51/94551/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 50/94550/7
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 49/94549/7
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 48/94548/7
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 47/94547/7
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 46/94546/7
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 45/94545/7
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 44/94544/5
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 agoBump deps to new Silicon dev versions 98/94398/5
guillaume.lambert [Mon, 4 Jan 2021 10:59:30 +0000 (11:59 +0100)]
Bump deps to new Silicon dev versions

org.opendaylight.odlparent * 8.0.0 -> 8.0.3
org.opendaylight.mdsal     * 7.0.1 -> 7.0.4

add jakarta.xml.bind-api dependency (needed by jersey-test) with
scope test in pce pom file as it was dropped from yangtools
dependencies in change
https://git.opendaylight.org/gerrit/c/yangtools/+/93852

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

3 years agoBump to Silicon 26/93026/21
manuedelf [Mon, 12 Oct 2020 13:11:58 +0000 (15:11 +0200)]
Bump to Silicon

- Update poms
- Update test-common following odl api update
- Fix unit tests (mainly adding mandatory withKey element in data
structure)
- Remove no more relevant unit tests following "withKey()" constraint

NB: the support of ordm devices models was initially flawed by a bug in
    mdsal that has been addressed in
    https://jira.opendaylight.org/browse/MDSAL-600

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

3 years agounforce lighty use in tox 64/93564/6
guillaume.lambert [Tue, 3 Nov 2020 10:43:35 +0000 (11:43 +0100)]
unforce lighty use in tox

This reverts commit b6b102950a565050d0b2678757be1e3c6973953b.
Lighty support for Silicon is not available on maven central yet.

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

3 years agooutsource flexgrid constants import in functests 52/94252/2
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

3 years agoclean renderer NetworkModelWavelengthServiceImpl 51/94251/2
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

3 years agosplit checkPartnerPort method in PortMapping 50/94250/2
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 49/94249/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

3 years agoimprove partner-port check in createTtpPortMapping 55/94055/3
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

3 years agoAlign and improve Portmapping versions Step 2 21/93921/18
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

3 years agouse ternary operators in portmapping 64/93964/7
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

3 years agomake honeynode download quieter 54/94054/3
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

3 years agomake honeynode and lighty builds unzip quieter 45/94045/4
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

3 years agoUpdate OTN E2E functional tests for 1GE 24/94124/3
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 23/94123/3
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 22/94122/3
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 21/94121/2
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 34/93934/3
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 45/93745/10
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 agoBump netconf dependencies to Al SR2 89/93989/1
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 agoadd a documentation spellchecker tox profile 25/93825/4
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 12/93812/2
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 24/93824/2
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 10/93810/4
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 40/93940/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 39/93939/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 88/93788/4
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 17/93917/3
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 08/93808/6
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 41/93641/8
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 65/93065/12
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 29/93529/9
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 31/92431/23
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 agoUpdate developer-guide with TAPI section 57/93657/1
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 agoRemove unused test resource files 44/93744/2
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 agoRewrite TAPI topology functional tests 01/93701/1
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 00/93700/1
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 99/93699/1
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 98/93698/1
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 97/93697/1
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 96/93696/1
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 95/93695/1
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 63/93563/2
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 51/93551/2
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 98/93498/2
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

3 years agoadd a healthcheck to lighty startup in func tests 00/93500/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

3 years agofix Lighty.io build 12/92812/9
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

3 years agoMerge "bump deps to latest Al SR1 dev platform versions"
Guillaume Lambert [Tue, 27 Oct 2020 09:48:58 +0000 (09:48 +0000)]
Merge "bump deps to latest Al SR1 dev platform versions"

3 years agobump deps to latest Al SR1 dev platform versions 97/93397/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 agoService Handler optimizations and technical debt 81/93081/3
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

3 years agoremove some findbugs jsr305 useless dependencies 26/93226/2
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

3 years agouse BOM in odl-transportpce feature pom 98/93098/3
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

3 years agofix/rename transportpce-network-topology YANG file 36/93036/5
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>
3 years agoClean up API YANG models with the help of pyang 69/92969/7
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>
3 years agorename API transportpce-renderer-device YANG file 40/92940/7
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>
3 years agofix a bug in ServiceHandler ModelMappingUtil 38/92938/5
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>
3 years agoTechnical debt - fix SH deprecated warnings 60/92960/1
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
(cherry picked from commit ee1ddcf873e73d9952aa5002e242b003c53795bf)

3 years agoTechnical debt - Service handler Sonar issues 59/92959/1
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>
(cherry picked from commit a07392226a2e30930323959a5f6925812f5192ae)

3 years agoBump to Aluminium SR1 dev version 37/93037/2
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 agoFix tpce internal Yang syntax 54/92954/1
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
(cherry picked from commit bded2dfda7111cb9d1f263b06794319103dc5d90)

3 years agoMerge "Technical debt - Fix PCE sonar issues"
Guillaume Lambert [Mon, 12 Oct 2020 09:32:01 +0000 (09:32 +0000)]
Merge "Technical debt - Fix PCE sonar issues"

3 years agoMerge "Technical debt - fix Renderer sonar issues"
Guillaume Lambert [Mon, 12 Oct 2020 09:31:24 +0000 (09:31 +0000)]
Merge "Technical debt - fix Renderer sonar issues"

3 years agoTechnical debt - Fix PCE sonar issues 51/92951/1
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>
(cherry picked from commit bc9a08be9d7cdeb30ecffd3c82ddd656a3a23043)

3 years agoTechnical debt - fix Renderer sonar issues 50/92950/1
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
(cherry picked from commit 77743225e0c72a218d6606a2767c979bee61c5ef)

3 years agorationalize inventory code 60/92460/2
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

3 years agoAdd OTN links support in TAPI topology 49/92949/1
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
(cherry picked from commit a01f4032cd7dc71e3f047db5b3e2db77c4733b2c)

3 years agoFix bug in TAPI for transitional links 48/92948/1
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
(cherry picked from commit 92025c52874815268743b848ea79e2fbe2a39ab7)