transportpce.git
2 years agoFix the misplacements of service notifications 15/96315/1
Thierry Jiao [Fri, 30 Apr 2021 07:22:20 +0000 (09:22 +0200)]
Fix the misplacements of service notifications

- Move the sending of the notification (Service deleted !) to the
correct end of the service-create operation
- Move the sending of the notification (Service implemented !) to the
correct end of the service-delete operation
- Send a service-create notification failure when Renderer service
implementation failed
- Send a service-delete notification failure when PCE cancel ressource
failed
- Send a service-delete notification failure when Renderer service
delete failed

JIRA: TRNSPRTPCE-447
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: If38f004e2de64febd456fd0a5d778ce1fa1bb0f2
(cherry picked from commit ffb5a8b2f12b498f367562c06d926e0dd059fb68)

2 years agoBump dependencies to newer Silicon dev versions 14/96314/1
guillaume.lambert [Thu, 27 May 2021 08:17:39 +0000 (10:17 +0200)]
Bump dependencies to newer Silicon dev versions

https://docs.opendaylight.org/projects/integration-distribution/en/stable-silicon/platform-versions.html

$ find . -name pom.xml -exec sed -i -e 's/1.13.1/1.13.2/g' \
-e 's/8.1.1/8.1.2/' -e 's/7.0.6/7.0.7/' \{\} +

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

2 years agoFix new checkstyle issues found by odlparent 8.1.2 13/96313/1
guillaume.lambert [Thu, 27 May 2021 08:52:28 +0000 (10:52 +0200)]
Fix new checkstyle issues found by odlparent 8.1.2

These issues needs to be fixed before bumping dependencies to pass CI.

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

2 years agoOTN-topology creation fix 77/95877/8
Shweta Vachhani [Wed, 21 Apr 2021 15:08:18 +0000 (11:08 -0400)]
OTN-topology creation fix

Moved ifCapType conversion method for different version of devices in
portMapping, rather than in OtnTopology

JIRA: TRNSPRTPCE-443
Signed-off-by: Shweta Vachhani <sv111y@att.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3eb51b64d986ee6ab620a7142e1e3e83a67f7eaa

2 years agoFix tox.ini otntopology profile 71/96371/2
guillaume.lambert [Tue, 25 May 2021 12:37:18 +0000 (14:37 +0200)]
Fix tox.ini otntopology profile

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

2 years agoFix deprecated warnings caused by YangTools update 70/96370/1
guillaume.lambert [Wed, 19 May 2021 21:00:57 +0000 (23:00 +0200)]
Fix deprecated warnings caused by YangTools update

Auto-generated sources from YANG models now deprecates methods with the
pattern is[A-Z].* This commit replaces them with their strict equivalent
with the pattern get[A-Z].*

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

2 years agoMute snapshots download status during lighty build 69/96369/1
guillaume.lambert [Wed, 19 May 2021 20:08:42 +0000 (22:08 +0200)]
Mute snapshots download status during lighty build

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

2 years agoMute Lighty reflective access warnings 68/96368/1
guillaume.lambert [Wed, 19 May 2021 19:49:37 +0000 (21:49 +0200)]
Mute Lighty reflective access warnings

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

2 years agoRemove useless & outdated lighty javadoc comments 67/96367/1
guillaume.lambert [Wed, 19 May 2021 19:30:08 +0000 (21:30 +0200)]
Remove useless & outdated lighty javadoc comments

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

2 years agoIgnore JsonStringConverter unchecked cast warning 66/96366/1
guillaume.lambert [Wed, 19 May 2021 13:30:51 +0000 (15:30 +0200)]
Ignore JsonStringConverter unchecked cast warning

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

2 years agoFix javadoc warnings in common PortMapping 65/96365/1
guillaume.lambert [Wed, 19 May 2021 13:26:25 +0000 (15:26 +0200)]
Fix javadoc warnings in common PortMapping

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

2 years agoFix Mockito initMocks deprecation warnings 64/96364/1
guillaume.lambert [Wed, 19 May 2021 13:10:51 +0000 (15:10 +0200)]
Fix Mockito initMocks deprecation warnings

This method is replaced by openMocks(testClass).close().
The close method should however only be called after completed usage
of testClass.
If using static-mocks or custom MockMakers, using this method might
cause misbehavior of mocks injected into the test class.

https://www.javadoc.io/doc/org.mockito/mockito-core/3.4.0/org/mockito/MockitoAnnotations.html

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

2 years agoUse maven batch and quiet modes inside tox 63/96363/1
Guillaume Lambert [Wed, 19 May 2021 12:24:22 +0000 (14:24 +0200)]
Use maven batch and quiet modes inside tox

Quiet mode will keep only maven errors and reduce logs size in tox jobs.
This will ease gate failures analysis.
Note that full logs will be still available in the maven-verify job.
Batch mode is also preferable since it is a non-interactive process in a
colorless terminal.

Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I6569c8a940fe8508229e1d6351daf07337f71523

3 years agoChange way to start simulators 67/96067/2
Gilles Thouenon [Tue, 13 Apr 2021 07:12:17 +0000 (09:12 +0200)]
Change way to start simulators

- change way to import modules from common and remove symbolic folder
links
- create a single flat simulators file containing all simulators
configurations in order to be able to launch topology configurations
composed of node devices of different versions
- adapt python test files accordingly
- create specific log directory for simulators in common

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

3 years agoSample of 7.1 device configuration for tpdr-400G 66/96066/2
Gilles Thouenon [Tue, 9 Feb 2021 18:20:37 +0000 (19:20 +0100)]
Sample of 7.1 device configuration for tpdr-400G

- add xml files of initial operational datastore for 7.1 tpdr-400G
usable by honeynode simulator

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

3 years agoAdapt existing honeynode configs to device 7.1 65/96065/2
Gilles Thouenon [Thu, 15 Apr 2021 07:32:42 +0000 (09:32 +0200)]
Adapt existing honeynode configs to device 7.1

Necessary to run new functional test suites with device in version 7.1.
Fix faceplate-label values in ROADM configurations files.

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

3 years agoUpdate lighty with device 7.1 models 63/96063/2
Gilles Thouenon [Sun, 25 Apr 2021 09:14:42 +0000 (11:14 +0200)]
Update lighty with device 7.1 models

Update LightyController initialization with generated java bindings to
manage an OpenROADM device in version 7.1.

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

3 years agoExplicit unchecked conversions in networkmodel 62/96062/2
guillaume.lambert [Tue, 13 Apr 2021 09:22:57 +0000 (11:22 +0200)]
Explicit unchecked conversions in networkmodel

to avoid compilation warnings.

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

3 years agoUpdate portmapping YANG model 58/96058/1
Gilles Thouenon [Sat, 13 Mar 2021 12:31:43 +0000 (13:31 +0100)]
Update portmapping YANG model

- refactor portmapping YANG model using grouping
- update all transportpce code consequently

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

3 years agoSet topology tp states from device port state 57/96057/1
Christophe Betoule [Thu, 11 Mar 2021 14:41:51 +0000 (15:41 +0100)]
Set topology tp states from device port state

set tp states in openroadm-topology and otn-topology according to states
of device port coming from port-mapping.

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

3 years agoPrepare use of Lighty core dev SNAPSHOTs 33/95933/3
guillaume.lambert [Fri, 2 Apr 2021 09:23:06 +0000 (11:23 +0200)]
Prepare use of Lighty core dev SNAPSHOTs

- create a shell script to build lighty core dev SNAPSHOTs
  (not available in maven central)
- prefill parameters to use 14.0.1-SNASPHOT
- update README.md and other materials

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

3 years agoMake honeynode install script more robust 32/95932/3
guillaume.lambert [Tue, 13 Apr 2021 09:43:42 +0000 (11:43 +0200)]
Make honeynode install script more robust

to connectivity issues.
They often happens in the gate.

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

3 years agoFix bug in ODU interface creation for device 7.1 31/95931/3
Gilles Thouenon [Mon, 12 Apr 2021 07:22:47 +0000 (09:22 +0200)]
Fix bug in ODU interface creation for device 7.1

At the odu interface creation on a device 7.1, set the mandatory
testPattern leaf inside the maint-testsignal container.

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

3 years agoIncrease sims startup timeout in functional tests 30/95930/3
guillaume.lambert [Mon, 12 Apr 2021 07:37:00 +0000 (09:37 +0200)]
Increase sims startup timeout in functional tests

Many failures in the gate seem to appear because the sims
do not start quickly enough.

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

3 years agoRefactor (un)registration of device listeners 29/95929/3
Gilles Thouenon [Mon, 12 Apr 2021 07:07:38 +0000 (09:07 +0200)]
Refactor (un)registration of device listeners

- simplify the way to register/unregister node listeners, taking into
acount the different device versions
- adapt UT of NetConfTopologyListener class

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

3 years agoHandle notification reception on port state change 28/95928/4
Gilles Thouenon [Sat, 6 Mar 2021 14:32:34 +0000 (15:32 +0100)]
Handle notification reception on port state change

- implement reception of a changeNotification on DeviceListener221 when
a device port state change
- rename DeviceListener to DeviceListener121 and align its
implementation on the DeviceListener221 one
- add a new DeviceListener710 with the same implementation of other
device listeners
- refactor all the NetconfTopologyListener class to remove technical
debts after extension to DeviceListener221 and DeviceListener710
- refactor NetconfTopologyListenerTest UT to be aligned with the new
implementation

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

3 years agoMerge "Update portmapping on port state notification" into stable/silicon
Guillaume Lambert [Tue, 27 Apr 2021 09:31:08 +0000 (09:31 +0000)]
Merge "Update portmapping on port state notification" into stable/silicon

3 years agoMerge "Increase controller startup timeout in func tests" into stable/silicon
Guillaume Lambert [Tue, 27 Apr 2021 09:30:51 +0000 (09:30 +0000)]
Merge "Increase controller startup timeout in func tests" into stable/silicon

3 years agoBump project version to 3.1.0-SNAPSHOT 34/95934/3
Gilles Thouenon [Mon, 26 Apr 2021 08:49:37 +0000 (10:49 +0200)]
Bump project version to 3.1.0-SNAPSHOT

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

3 years agoUpdate portmapping on port state notification 27/95927/1
Gilles Thouenon [Sat, 6 Mar 2021 14:34:27 +0000 (15:34 +0100)]
Update portmapping on port state notification

- review javadoc for PortMapping interface
- implements new getMapping method to retreive mapping from circuit-pack
name and port name
- add new updateMappingObject method
- review updateMapping() method
- review createMappingObject() method

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

3 years agoIncrease controller startup timeout in func tests 26/95926/1
guillaume.lambert [Fri, 9 Apr 2021 12:22:34 +0000 (14:22 +0200)]
Increase controller startup timeout in func tests

Many failures in the gate seem to appear because the controller
does not start quickly enough.

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

3 years agoDecrease docs tox profiles logs verbosity 15/95815/1
guillaume.lambert [Sat, 24 Apr 2021 08:31:32 +0000 (10:31 +0200)]
Decrease docs tox profiles logs verbosity

This will ease gate failures analysis.

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

3 years agoUpgrade honeynode sim for device 1.2.1 and 7.1 12/95812/1
Gilles Thouenon [Thu, 15 Apr 2021 11:16:52 +0000 (13:16 +0200)]
Upgrade honeynode sim for device 1.2.1 and 7.1

This new version of simulators allows having exactly the same behavior
as device 2.2.1 regarding the handling of port state change
notifications.

JIRA: TRNSPRTPCE-438
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie023c32024c3f31f95a80a9b32bdd191829ae9c6
(cherry picked from commit b1963de14a066689a386d062a4c936730296518e)

3 years agoUpdate device transactions operation 11/95811/1
Shweta Vachhani [Tue, 20 Apr 2021 17:57:25 +0000 (13:57 -0400)]
Update device transactions operation

from put to merge in

1) Openroadm Interfaces
2) Openroadm cross-connects
3) OLM power updates

JIRA: TRNSPRTPCE-444
Signed-off-by: Shweta Vachhani <sv111y@att.com>
Change-Id: I1f7f29bdf189545d428d0baac7c2a218021d3e3e
(cherry picked from commit b348e552b49373f609c67809c82c61c93c611c1a)

3 years agoBump deps to new Silicon dev versions 53/95853/1
guillaume.lambert [Mon, 19 Apr 2021 17:48:44 +0000 (13:48 -0400)]
Bump deps to new Silicon dev versions

org.opendaylight.odlparent *  8.1.0 -> 8.1.1
org.opendaylight.mdsal     *  7.0.5 -> 7.0.6
org.opendaylight.netconf   * 1.13.0 -> 1.13.1

https://docs.opendaylight.org/projects/integration-distribution/en/stable-silicon/platform-versions.html

This fixes the SSH issue described in NETCONF-765
an that occurs with some OpenROADM devices too.

JIRA: NETCONF-765 TRNSPRTPCE-441
Co-Authored-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: If166b3b40c80f1fa1cc69c1dfebc71d98db516e1

3 years agoLighty support Silicon migration 47/95847/4
guillaume.lambert [Fri, 2 Apr 2021 09:23:06 +0000 (11:23 +0200)]
Lighty support Silicon migration

- bump lighty pom to 14.0.0
- adapt tox.ini accordingly
- fix README.md
- force lighty use in tox

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

3 years agoFix function test PCE 400G return code 50/95850/2
guillaume.lambert [Tue, 20 Apr 2021 15:24:01 +0000 (17:24 +0200)]
Fix function test PCE 400G return code

The first test return code can shifted from 200 (OK) to 201 (created)
depending on the order that functional tests are run,
but also with or without lighty support.

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

3 years agoAdd nbinotifications feature documentation 09/95809/1
Thierry Jiao [Wed, 14 Apr 2021 12:15:00 +0000 (14:15 +0200)]
Add nbinotifications feature documentation

add descriptions of nbinotifications feature
into the developper-guide and user-guide.

JIRA: TRNSPRTPCE-406
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: Ic27840223a3d3e13e93f4d572850f2fcd8097df3
(cherry picked from commit 5584538bd1fb5dbb0958511932b6783353abf7c4)

3 years agoImprove docs/conf.py 83/95483/2
guillaume.lambert [Fri, 9 Apr 2021 12:16:36 +0000 (14:16 +0200)]
Improve docs/conf.py

- increase docs-linkcheck timeout
- ignore dmaap sample URL

JIRA: TRNSPRTPCE-406
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5611872ef34e4eca30705b6d3cc6df73138ca0e2
(cherry picked from commit 57761bbd7896b96ea49e989ddda069fd1f6afd50)

3 years agoAdd Dmaap client feature documentation 82/95482/1
manuedelf [Tue, 6 Apr 2021 10:34:16 +0000 (12:34 +0200)]
Add Dmaap client feature documentation

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

3 years agofix issue in Lighty for PortMapping 81/95481/1
Christophe Betoule [Wed, 31 Mar 2021 13:06:58 +0000 (15:06 +0200)]
fix issue in Lighty for PortMapping

Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ia9dd5a87218fb57c6befd7356ac4a8f053a3d1f7
(cherry picked from commit 3ce821fa313d35ca73caf877be327ade10493bf7)

3 years agoRemove a useless dependency in PCE 08/95608/1
guillaume.lambert [Tue, 30 Mar 2021 14:11:15 +0000 (16:11 +0200)]
Remove a useless dependency in PCE

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

3 years agoFix a few compilation warnings 06/95606/1
guillaume.lambert [Tue, 30 Mar 2021 10:26:16 +0000 (12:26 +0200)]
Fix a few compilation warnings

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

3 years agoFix OpenRoadmInterface710 portmapping revision 05/95605/2
guillaume.lambert [Tue, 30 Mar 2021 09:46:35 +0000 (11:46 +0200)]
Fix OpenRoadmInterface710 portmapping revision

A few previous commits were not rebased before merging.
And the automerge Gerrit process dealt incorrectly with this import.

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

3 years agoUpdate .gitreview 02/95602/1
guillaume.lambert [Tue, 30 Mar 2021 08:07:36 +0000 (10:07 +0200)]
Update .gitreview

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

3 years agoMerge "Functional test for pce 400G"
Guillaume Lambert [Mon, 29 Mar 2021 08:01:21 +0000 (08:01 +0000)]
Merge "Functional test for pce 400G"

3 years agoMerge "Fix bug in portmapping"
Guillaume Lambert [Mon, 29 Mar 2021 07:58:48 +0000 (07:58 +0000)]
Merge "Fix bug in portmapping"

3 years agoMerge "Device Renderer to support transponder for B100G"
Guillaume Lambert [Thu, 25 Mar 2021 12:46:40 +0000 (12:46 +0000)]
Merge "Device Renderer to support transponder for B100G"

3 years agoFix bug in portmapping 88/95488/4
Christophe Betoule [Thu, 11 Mar 2021 15:59:42 +0000 (16:59 +0100)]
Fix bug in portmapping

Sort the way circuit-packs are handling when creating mapping object in
order to have logical affectation of logical-connection-point and their
associated ports.

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

3 years agoMerge "Improve otnrenderer functional test"
Guillaume Lambert [Wed, 24 Mar 2021 13:49:19 +0000 (13:49 +0000)]
Merge "Improve otnrenderer functional test"

3 years agoDevice Renderer to support transponder for B100G 73/95473/2
Balagangadhar Bathula [Wed, 24 Feb 2021 15:07:47 +0000 (10:07 -0500)]
Device Renderer to support transponder for B100G

- Addition of OpenRoadm interfaces for 7.1.0 model
- Modification to  OpenRoadm interface factory
- Modify the JUnit tests, Lighty and OSGi resources to support this change

JIRA: TRNSPRTPCE-258
Change-Id: I896eb3d3dd958afba7186335207cf385d8ec8034
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
3 years agoMerge "Updated OLM module to support 7.1 devices"
Guillaume Lambert [Wed, 24 Mar 2021 12:51:03 +0000 (12:51 +0000)]
Merge "Updated OLM module to support 7.1 devices"

3 years agoImprove otnrenderer functional test 91/95491/3
guillaume.lambert [Thu, 11 Mar 2021 16:24:46 +0000 (17:24 +0100)]
Improve otnrenderer functional test

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

3 years agoImprove debug tools install 15/95415/3
guillaume.lambert [Fri, 5 Mar 2021 17:29:20 +0000 (18:29 +0100)]
Improve debug tools install

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

3 years agoFunctional test for pce 400G 65/95465/10
Christophe Betoule [Thu, 11 Mar 2021 09:26:08 +0000 (10:26 +0100)]
Functional test for pce 400G

Tests the path computation request for a 400GE service between two 400G
transponders

JIRA: TRNSPRTPCE-372
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I1432d92890771786eb01c658462ca1c3876c046c

3 years agoMerge changes from topic "nbinotification"
Guillaume Lambert [Mon, 15 Mar 2021 09:15:15 +0000 (09:15 +0000)]
Merge changes from topic "nbinotification"

* changes:
  Dmaap client as a karaf feature
  Dmaap client
  Add tests for service Notifications
  Update ServiceHandler to send service notification
  Improve lighty format message
  Fix a few typo in lighty main
  NBI Notifications as karaf feature
  Add new Maven module to manage NBI Notifications

3 years agoFix maven detection in tox.ini 90/95490/2
guillaume.lambert [Thu, 11 Mar 2021 16:25:29 +0000 (17:25 +0100)]
Fix maven detection in tox.ini

which is better indicated than command eventually

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

3 years agoDmaap client as a karaf feature 83/94983/24
manuedelf [Tue, 2 Feb 2021 22:14:24 +0000 (23:14 +0100)]
Dmaap client as a karaf feature

- add new maven module in features maven projet
- to override default Dmaap server properties, export following env
variable before starting karaf and installing the feature:
DMAAP_BASE_URL, DMAAP_USERNAME and DMAAP_PASSWORD if authentication is
needed

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

3 years agoDmaap client 82/94982/19
manuedelf [Tue, 2 Feb 2021 22:08:17 +0000 (23:08 +0100)]
Dmaap client

- REST client in order to send TPCE notification
on ONAP Dmaap Message router.
- Add a new maven module dmaap-client.
- Use customized jackson serializer as a temporary workaround
while waiting jackson support in yang tools
https://git.opendaylight.org/gerrit/c/yangtools/+/94852

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

3 years agoAdd tests for service Notifications 72/94272/29
Thierry Jiao [Thu, 17 Dec 2020 17:39:49 +0000 (18:39 +0100)]
Add tests for service Notifications

- Add functional test test_nbinotifications.py to check the sending of
  service notifications when service-create and service-delete
  are invoked
- Update test_utils.py by adding a new function capable of getting the
  service notifications
- Add docker-compose.yml necessary for Kafka and ZooKeeper dockers
- Update tox.ini to include the new functional test and run
  Kafka/ZooKeeper dockers

JIRA: TRNSPRTPCE-343
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: Ice4d8a2980317ee1dca6533752466305ed525981

3 years agoUpdate ServiceHandler to send service notification 71/94271/29
Thierry Jiao [Thu, 17 Dec 2020 17:30:27 +0000 (18:30 +0100)]
Update ServiceHandler to send service notification

- Update the methods service-create and delete-service in order to
  notify the execution state by using the
  class Publisher (nbinotifications)
- Update the classes PceListenerImpl, RendererListenerImpl to also
  notify the execution state
- Update ServicehandlerImplTest by adding mock for the class Publisher

JIRA: TRNSPRTPCE-343
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: I6c026d78e906a4de584bf73577ed173ea2d69f96

3 years agoImprove lighty format message 16/95416/3
guillaume.lambert [Fri, 5 Mar 2021 17:36:32 +0000 (18:36 +0100)]
Improve lighty format message

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

3 years agoFix a few typo in lighty main 12/95412/5
guillaume.lambert [Thu, 4 Mar 2021 17:16:59 +0000 (18:16 +0100)]
Fix a few typo in lighty main

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

3 years agoNBI Notifications as karaf feature 23/94623/26
manuedelf [Tue, 12 Jan 2021 22:11:47 +0000 (23:11 +0100)]
NBI Notifications as karaf feature

- add a new maven module in features maven project
- update lighty with NBI notification:
  - NBI notifications is optional and could be activated through command
    line option -nbinotification
  - restconf file configuration is now passed with -restconf command
    line option
  - add apache common-cli to ease the parsing of command line options

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

3 years agoAdd new Maven module to manage NBI Notifications 70/94270/27
Thierry Jiao [Thu, 17 Dec 2020 17:04:59 +0000 (18:04 +0100)]
Add new Maven module to manage NBI Notifications

- Implement a new Maven module named nbinotifications containing classes
  capable of communicating with Kafka server
- Add the class Subscriber capable of reading events from topics Kafka
- Add the class Publisher capable of writing events from topics Kafka
- Add yang file nbi-notifications to model the service notifications
- Implement a new RPC API named GetNotificationsService capable of
  returning the notifications stored in a topic Kafka
- Implement a new RPC API named publishNotificationService in charge of
  publishing a message in Kafka topic
- Add a listener to the RPC GetNotificationsService
- Add new blueprint in nbinotifications
- Add unit tests to check the functionning of nbinotifications classes
- Update pom.xml to implement the new module nbinotifications

JIRA: TRNSPRTPCE-343
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: I74298292034e4a158b27dd5db47e63918026684b

3 years agoSet port states in portMapping 63/95463/4
Gilles Thouenon [Wed, 10 Mar 2021 15:37:19 +0000 (16:37 +0100)]
Set port states in portMapping

- set the administrative and operational states of a port in the mapping
object
- update functional tests accordingly

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

3 years agoUpdate port-mapping model with port states 62/95462/3
Gilles Thouenon [Wed, 10 Mar 2021 15:32:44 +0000 (16:32 +0100)]
Update port-mapping model with port states

Add operational and administrative states of the port in the mapping
list

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

3 years agoFix some scripts shebang 23/95423/2
guillaume.lambert [Mon, 8 Mar 2021 15:04:50 +0000 (16:04 +0100)]
Fix some scripts shebang

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

3 years agoAdd a checkbashisms tox profile 30/95430/5
Guillaume Lambert [Tue, 9 Mar 2021 14:23:20 +0000 (15:23 +0100)]
Add a checkbashisms tox profile

to identify potential bashisms in tests scripts
and ensure compatibility with dash, MAC OS X and BSD shells.

https://wiki.ubuntu.com/DashAsBinSh
https://mywiki.wooledge.org/Bashism

Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I32acb2721f828bbfb283089aad5dbd446b662cd2

3 years agoMerge "Adapt PCE to compute a 400GE path"
Guillaume Lambert [Wed, 10 Mar 2021 08:36:10 +0000 (08:36 +0000)]
Merge "Adapt PCE to compute a 400GE path"

3 years agoUpgrade honeynode 2.2.1 simulator version 22/95422/1
Gilles Thouenon [Mon, 8 Mar 2021 14:01:05 +0000 (15:01 +0100)]
Upgrade honeynode 2.2.1 simulator version

- node emits a change-notification when status of a port changes (and
only on this case)

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

3 years agoUpdated OLM module to support 7.1 devices 34/94634/8
Shweta Vachhani [Thu, 14 Jan 2021 18:23:56 +0000 (13:23 -0500)]
Updated OLM module to support 7.1 devices

1) PM retrieval added for 7.1.0 models
2) Added new power management class for 7.1.0 models
3) Updated power management code to support hybrid network
4) Fix interface creation issue in renderer
5) rename OlmUtils22 class to OlmUtils221

JIRA: TRNSPRTPCE-381
Signed-off-by: Shweta Vachhani <sv111y@att.com>
Change-Id: I282825df61fe3f469ca5af507a67a96d0b3aedfb

3 years agoMerge "Fix topology link and service update"
Guillaume Lambert [Mon, 8 Mar 2021 08:20:21 +0000 (08:20 +0000)]
Merge "Fix topology link and service update"

3 years agoAdapt PCE to compute a 400GE path 41/95141/8
Christophe Betoule [Thu, 11 Feb 2021 11:24:03 +0000 (12:24 +0100)]
Adapt PCE to compute a 400GE path

- on a simple openroadm-topology with only tpdr-400GE
- in PceCalculation, remove boolean returned by validateNode() and
validateOtnNode() since not used anywhere
- inject PortMapping instance in several PCE classes to retrieve
if-capabilities from portmapping in order to prune invalid nodes from
openroadm-topology
- add a new isTpWithGoodCapabilities() method in PceOpticalNode class to
check the node capabilities with regards to the type of service to
compute
- adapt blue-print to inject portmapping instance
- adapt PCE UT mocking PortMapping instance in all adequate constructors

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

3 years agoManage 400G in portmapping and topologies 99/95099/7
Gilles Thouenon [Tue, 9 Feb 2021 18:09:43 +0000 (19:09 +0100)]
Manage 400G in portmapping and topologies

- retrieve if-cap-type from port-capabilities from device to populate
portmapping
- add protection in otn-topology when building TP if if-cap-type absent
from mapping
- manage 400G if-cap-type case in otn-topology

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

3 years agoImprove honeynode installation process in tox 38/95338/1
guillaume.lambert [Wed, 24 Feb 2021 09:19:10 +0000 (10:19 +0100)]
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

3 years agoSmall improvement in PceGraph 32/95332/1
guillaume.lambert [Wed, 24 Feb 2021 08:45:25 +0000 (09:45 +0100)]
Small improvement in PceGraph

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

3 years agoFix topology link and service update 37/95237/2
Errea Moreno, Javier [Fri, 19 Feb 2021 12:14:10 +0000 (13:14 +0100)]
Fix topology link and service update

- Include nodeId+TpId as the key of the topology changes map
- This will fix bug -> wrong nodes/links being updated

JIRA: TRNSPRTPCE-400
Change-Id: I30006e199d4a30bc8cf974995a478a7ab49fc445
Signed-off-by: Javier <errea@eurecom.fr>
3 years agoMerge "Update Netconf dependencies version"
Guillaume Lambert [Tue, 23 Feb 2021 15:24:19 +0000 (15:24 +0000)]
Merge "Update Netconf dependencies version"

3 years agoMerge "Small improvement in Xponder-in/out link creation"
Guillaume Lambert [Tue, 23 Feb 2021 14:31:40 +0000 (14:31 +0000)]
Merge "Small improvement in Xponder-in/out link creation"

3 years agoUpdate Netconf dependencies version 24/95324/1
guillaume.lambert [Tue, 23 Feb 2021 14:27:57 +0000 (15:27 +0100)]
Update Netconf dependencies version

Netconf is now a MRI project and do not use anymore SANPSHOT versions.

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

3 years agoMerge changes from topic "nbinotification"
Guillaume Lambert [Tue, 23 Feb 2021 14:22:22 +0000 (14:22 +0000)]
Merge changes from topic "nbinotification"

* changes:
  Honeynode for 7.1 devices
  Fix grep feature name in test_utils.py

3 years agoSmall improvement in Xponder-in/out link creation 20/95320/1
Guillaume Lambert [Tue, 23 Feb 2021 10:49:25 +0000 (11:49 +0100)]
Small improvement in Xponder-in/out link creation

JIRA: TRNSPRTPCE-397
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I909000695248045af7e53f0c7b72af307233f1cb

3 years agoMerge "Add protection on Xponder-in/out link creation"
Guillaume Lambert [Tue, 23 Feb 2021 10:35:19 +0000 (10:35 +0000)]
Merge "Add protection on Xponder-in/out link creation"

3 years agoHoneynode for 7.1 devices 10/95110/5
manuedelf [Wed, 10 Feb 2021 10:38:02 +0000 (11:38 +0100)]
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

3 years agoFix grep feature name in test_utils.py 13/95213/2
manuedelf [Wed, 17 Feb 2021 18:05:11 +0000 (19:05 +0100)]
Fix grep feature name in test_utils.py

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

3 years agoMerge changes Ib173fc1f,I81b1016b,I159835f7,Ifb870561,Id642171b
Guillaume Lambert [Tue, 23 Feb 2021 10:03:22 +0000 (10:03 +0000)]
Merge changes Ib173fc1f,I81b1016b,I159835f7,Ifb870561,Id642171b

* changes:
  disable PMD/CPD checks in 2 portmapping classes
  Add portmapping methods to fill XpdR LCPs maps
  Fix usage of deprecated method in portmapping
  Fix+align portmapping protections and log messages
  Add a portmapping method to retrieve Xpdr port2

3 years agoAdd protection on Xponder-in/out link creation 30/95130/3
Christophe Betoule [Thu, 11 Feb 2021 09:30:00 +0000 (10:30 +0100)]
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

3 years agoGNPy client refactor 86/95086/5
manuedelf [Mon, 8 Feb 2021 21:35:38 +0000 (22:35 +0100)]
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

3 years agoJsonStringConverter in GNPy 38/95038/6
manuedelf [Thu, 4 Feb 2021 14:34:08 +0000 (15:34 +0100)]
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

3 years agoAdd generic json String converter 37/95037/6
manuedelf [Thu, 4 Feb 2021 09:47:08 +0000 (10:47 +0100)]
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

3 years agoFix Gnpy functional tests 36/95036/4
manuedelf [Thu, 4 Feb 2021 14:22:19 +0000 (15:22 +0100)]
Fix Gnpy functional tests

Update topology file

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

3 years agoMerge changes Ifd9a205e,I5d358413,I4f693297
Guillaume Lambert [Tue, 9 Feb 2021 10:49:25 +0000 (10:49 +0000)]
Merge changes Ifd9a205e,I5d358413,I4f693297

* changes:
  Rename TAPI UT class name
  Align tapi topology states on OOR topology ones
  Update topology input files for Tapi topology UT

3 years agoMerge changes I8295bb63,I628ef618,Ic7ebdea9,I21faea97
Guillaume Lambert [Mon, 8 Feb 2021 16:53:54 +0000 (16:53 +0000)]
Merge changes I8295bb63,I628ef618,Ic7ebdea9,I21faea97

* changes:
  Add a portmapping putXpdrLcpsInMaps method
  Add a portmapping method to create Xpdr LCP names
  Improve portmapping LCP names creation process
  Add a portmapping method to map degrees

3 years agodisable PMD/CPD checks in 2 portmapping classes 44/94844/2
guillaume.lambert [Wed, 27 Jan 2021 15:07:11 +0000 (16:07 +0100)]
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

3 years agoAdd portmapping methods to fill XpdR LCPs maps 81/94881/3
guillaume.lambert [Fri, 29 Jan 2021 12:45:55 +0000 (13:45 +0100)]
Add portmapping methods to fill XpdR LCPs maps

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

3 years agoRename TAPI UT class name 29/95029/4
Gilles Thouenon [Thu, 4 Feb 2021 14:18:38 +0000 (15:18 +0100)]
Rename TAPI UT class name

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

3 years agoAlign tapi topology states on OOR topology ones 28/95028/4
Gilles Thouenon [Tue, 2 Feb 2021 17:56:19 +0000 (18:56 +0100)]
Align tapi topology states on OOR topology ones

- convert administrative and operational states read from openroadm and
otn topologies to tapi states. Since tapi link is bidirectional, adapt
ConvertORTopoToTapiTopo and TapiTopologyImpl classes to take into acount
also states of opposite link (need to introduce Map instead of List in
some treatment)
- create new unitary tests in ConvertORTopoToTapiTopoTest.java to check
this new treatment

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

3 years agoUpdate topology input files for Tapi topology UT 27/95027/2
Gilles Thouenon [Tue, 2 Feb 2021 17:36:21 +0000 (18:36 +0100)]
Update topology input files for Tapi topology UT

- to take into acount Administrative and operational states present in
openroadm-topology and otn-topology, as well as flexgrid data
- fix issues in ConvertORTopoToTapiTopo.java when converting openroadm
supported interfaces to tapi supported layer protocoles (extend the
number of supported interfaces handled, use Set interface instead of
List to avoid possible duplication of entries)
- adapt UT consequently

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

3 years agoFix usage of deprecated method in portmapping 45/95045/2
Gilles Thouenon [Fri, 5 Feb 2021 12:46:14 +0000 (13:46 +0100)]
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