git.opendaylight Code Review - transportpce.git/log

Improve honeynode installation process in tox

- update install_honeynode.sh script to allow an installation
  per version or a list of versions as argument(s)
  rather than forcing the installing of all versions systematically.
- remove honeynode installation from tox gnpy profile
  since gnpy test does not use any simulator.
- fix flexgrid placement in tox.ini (it should be with 2.2.1 profiles)
- split honeynode installation in 2 lines inside tox.ini
  so that the called profiles only install the honeynode version(s)
  that they need.
  This spares ressources and time on the gate and prevent
  the installation of version 7.1, which is currently not used.

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

Honeynode for 7.1 devices

- update install_honeynode.sh script to install honeynode for devices
7.1
- create tests/honeynode/7.1 directory

JIRA: TRNSPRTPCE-368
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Iae5a5930fe2276e4eb6201ae559f02612c8c070b
(cherry picked from commit fc468b23a197bd55e46b8b4add1388ff4f6a90e7)

Fix grep feature name in test_utils.py

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I244605777b81db1a0016b65742f95a9ea356ea72
(cherry picked from commit 4a3e94824b3d608fa3b21eee21f5dae220dc41fd)

Merge changes I28cba22c,I7f0d4601,I8df37176 into stable/aluminium

* changes:
  GNPy client refactor
  JsonStringConverter in GNPy
  Add generic json String converter

Add protection on Xponder-in/out link creation

- avoid NPE when attempting to create an xponder-in/out link terminating
on an unexisting TP
- remove unnecessary log message

JIRA: TRNSPRTPCE-397
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I0f5ce99078872a487dfcd28f9f29f522c329079c
(cherry picked from commit d48474417b7498e4b1ca09dc61fa008cdd9ca95a)

GNPy client refactor

- Put GNPy api consumer in a specific package
- Remove hard-coded base url, username and password by putting
paramteres in blueprint configuration file (but still hardcoded in
lighty)
- Use jersey client package for requesting GNPy
- Use customized jackson serializer/deserialize as a temporary
workaround while waiting jackson support in yang tools
https://git.opendaylight.org/gerrit/c/yangtools/+/94852
- Update unit tests

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

JsonStringConverter in GNPy

Replace ServiceDataStoreOperations with use of generic
JsonStringConverter while generating the payload for GNPy request api.

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

Add generic json String converter

In order to replace DataStoreServiceOperations in PCE, create a generic
json string converter in common module.
This converter will be used for serialization in nbi notifications
module.

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

disable PMD/CPD checks in 2 portmapping classes

The issue is already reported by a FIXME comment in the code.
The code is effectively similar but the types are different
since they are related to 3 different OpenROADM versions.
Using generics in this case is not helpful.

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

Add portmapping methods to fill XpdR LCPs maps

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

Fix usage of deprecated method in portmapping

Replace List by Map for McCapabilities treatment to avoid compilation
warnings.

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

Fix+align portmapping protections and log messages

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

Add a portmapping method to retrieve Xpdr port2

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

Set mandatory UUID in TAPI connectivity module

JIRA: TRNSPRTPCE-388
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I5b2e99a06461dee708324eb5677425b20ab704a8
(cherry picked from commit 8aa2a4274fed6e7aabe45832194733d91db0cf25)
(cherry picked from commit 3f3033d56040fbd1f24540540a80ea80c0f184eb)

Fix the SIP uuid generation in TAPI topology

Avoid randomly generation of UUID for the ServiceInterfacePoint in TAPI
topology since it is used in the create-connectivity-service input RPC

JIRA: TRNSPRTPCE-389
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ieabeb3e8594af2cd1cc4f56396d07d8ab0b164a5
(cherry picked from commit f07576835c256e0475043bc4d22fbc2a8c13e0fe)
(cherry picked from commit 39045f4843302526c797b872d6f4dc4405e42050)

Bump dependencies and project version to Al SR3

- netconf-artifacts version to 1.9.3-SNAPSHOT
- transportpce version to 2.3.0-SNAPSHOT

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

Merge "Change maven download link" into stable/aluminium

Merge "Fix variable name in tapi-topology" into stable/aluminium

Fix variable name in tapi-topology

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3f94e494c4fffe61928df21f9394f4fbc725eb23
(cherry picked from commit f80a8e490bfc41bdb93ea0ca3b4a619a9b61ddcf)

Change maven download link

The previous seems down

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ic4f754e41981ec721f4f3cea07e27889c80dc4a1
(cherry picked from commit 8c3e33d9bacf8c122122dc45c5113401d0791719)

Add a portmapping putXpdrLcpsInMaps method

JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8295bb6352d2fb476a88af9490ea067f11048a75
(cherry picked from commit 9338fc4be627ccfdab73602604a78812b748d88d)

Add a portmapping method to create Xpdr LCP names

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

Improve portmapping LCP names creation process

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

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
(cherry picked from commit 5560bd76a985f174b8ddcb620cd2b375949916db)

Fix resource deletion issue in openroadm-topology

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

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

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

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

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

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

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

Add methods to GridUtils

Add getCentralFrequencyWithPrecision and computeCentralFrequency.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

outsource flexgrid constants import in functests

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

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)

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

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)

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)

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)

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)

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)

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)

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

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

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

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

Update Honeynode simulator version

Following java version regexp fix in honeycomb-tpce.

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

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

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

Ordmodels - Remove generated code from source control

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

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

add pyang tox profiles to check/format api models

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

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

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

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

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

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

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

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

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

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>

Remove unused test resource files

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

Bump project version to Al SR2

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

Bump netconf dependencies to Al SR2

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

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

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

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

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

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

Fix a method name typo in tapi module

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

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

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

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

remove odl-mdsal-broker useless dep from features

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

force lighty use in tox

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

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)

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)

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)

bump deps to latest Al SR1 dev platform versions

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

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)

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)

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)