transportpce.git
2 weeks agoMerge changes I8b6da9f3,I425a1d19,Ia3dfe19f,Idd68c408,I73f0c083, ... master
Gilles Thouenon [Fri, 29 Jul 2022 09:35:49 +0000 (09:35 +0000)]
Merge changes I8b6da9f3,I425a1d19,Ia3dfe19f,Idd68c408,I73f0c083, ...

* changes:
  Migrate OTN E2E functional tests to RFC8040 step 6
  Migrate OTN E2E functional tests to RFC8040 step 5
  Migrate OTN E2E functional tests to RFC8040 step 4
  Migrate OTN E2E functional tests to RFC8040 step 3
  Migrate OTN E2E functional tests to RFC8040 step 2
  Migrate OTN E2E functional tests to RFC8040 step 1

2 weeks agoMerge "Bump lighty.io build to Sulfur SR1"
Gilles Thouenon [Thu, 28 Jul 2022 14:24:40 +0000 (14:24 +0000)]
Merge "Bump lighty.io build to Sulfur SR1"

2 weeks agoMerge "Refactor networkmodel OpenRoadmTopology Part 4"
Guillaume Lambert [Wed, 27 Jul 2022 14:16:05 +0000 (14:16 +0000)]
Merge "Refactor networkmodel OpenRoadmTopology Part 4"

2 weeks agoMerge "Switch tests from nose to pytest"
Guillaume Lambert [Wed, 27 Jul 2022 08:07:35 +0000 (08:07 +0000)]
Merge "Switch tests from nose to pytest"

2 weeks agoMigrate OTN E2E functional tests to RFC8040 step 6 71/101871/3
guillaume.lambert [Tue, 26 Jul 2022 14:50:17 +0000 (16:50 +0200)]
Migrate OTN E2E functional tests to RFC8040 step 6

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

2 weeks agoMigrate OTN E2E functional tests to RFC8040 step 5 70/101870/4
guillaume.lambert [Mon, 25 Jul 2022 20:38:32 +0000 (22:38 +0200)]
Migrate OTN E2E functional tests to RFC8040 step 5

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

2 weeks agoMigrate OTN E2E functional tests to RFC8040 step 4 69/101869/1
guillaume.lambert [Mon, 25 Jul 2022 13:55:50 +0000 (15:55 +0200)]
Migrate OTN E2E functional tests to RFC8040 step 4

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

2 weeks agoMigrate OTN E2E functional tests to RFC8040 step 3 67/101867/2
guillaume.lambert [Mon, 25 Jul 2022 11:42:52 +0000 (13:42 +0200)]
Migrate OTN E2E functional tests to RFC8040 step 3

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

2 weeks agoMigrate OTN E2E functional tests to RFC8040 step 2 57/101757/7
guillaume.lambert [Wed, 6 Jul 2022 14:58:23 +0000 (16:58 +0200)]
Migrate OTN E2E functional tests to RFC8040 step 2

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

2 weeks agoBump lighty.io build to Sulfur SR1 66/101866/1
guillaume.lambert [Mon, 25 Jul 2022 08:36:54 +0000 (10:36 +0200)]
Bump lighty.io build to Sulfur SR1

Version 16.1.0 for Sulfur SR1 is available.

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

3 weeks agoFix typo developer guide 62/101862/1
Javier Errea [Thu, 21 Jul 2022 14:48:43 +0000 (16:48 +0200)]
Fix typo developer guide

Signed-off-by: Javier Errea <errea@eurecom.fr>
Change-Id: Idde79145b85026c6a5ad442a4619e37cffa0f62e

4 weeks agoReplace tpce-topology yang by existing ordmodels 46/101646/12
Thierry Jiao [Thu, 30 Jun 2022 09:08:50 +0000 (11:08 +0200)]
Replace tpce-topology yang by existing ordmodels

- Replace all use of transportpce-topology elements with identical ones
present in OpenROADM models
- If there is no replica of an element in OpenROADM models, displace the
element to 'api/src/main/yang/transportpce-networkutils.yang'
- Delete the 'transportpce-topology' yang file

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

5 weeks agoT-API notification functional tests 69/100469/21
Javier Errea [Thu, 7 Apr 2022 12:20:05 +0000 (14:20 +0200)]
T-API notification functional tests

- Functional tests for device change notification
  in tapi context
- Functional tests for tapi notification service
- nbinotifications testenv in tox.ini needs to
  install tapi feature

JIRA: TRNSPRTPCE-583
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: If73a79025d7abf21308279ad10b9597b37874936

5 weeks agoUpdate developer guide 41/101641/3
Javier Errea [Wed, 29 Jun 2022 15:46:22 +0000 (17:46 +0200)]
Update developer guide

- Include tapi notification service information
- Update tpce architecture

JIRA: TRNSPRTPCE-678
Signed-off-by: Javier Errea <errea@eurecom.fr>
Change-Id: I6c6e43a86cdc0aea29d24ff342284388ea8d2213

5 weeks agoImplementation of T-API notification rpcs 50/98050/29
Javier Errea [Fri, 22 Oct 2021 13:40:49 +0000 (15:40 +0200)]
Implementation of T-API notification rpcs

- Tapi notification rpcs implementation
- tapi notification de-serializer
- Add ENABLE_AUTO_COMMIT_CONFIG to kafka subscriber
  configuration & and TopicPartition 0 to ConsumerRecords
  to enable to read TapiNotifications

JIRA: TRNSPRTPCE-560
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: Ic49522b43c6351835eec67001e42887392a71238

5 weeks agoInitial tapi notification implementation 38/97438/40
Javier Errea [Wed, 11 Aug 2021 13:06:54 +0000 (15:06 +0200)]
Initial tapi notification implementation

- Tapi notification to nbi module
- Create notification subscription service rpc
- Create tapi topic in kafka server and send tapi notifications
- Service state change use case
- Extension of nbi module to support tapi notification service
- Update nbinotification revision date
- TapiRendererListener sends a notification when TAPI service
  is implemented

JIRA: TRNSPRTPCE-387
Change-Id: I32ebbf62570474b5f18787ad0c1c422f3e5e8d68
Signed-off-by: errea <errea@eurecom.fr>
5 weeks agoAdd tests for autonomous service rerouting 38/101638/10
Thierry Jiao [Mon, 27 Jun 2022 08:42:48 +0000 (10:42 +0200)]
Add tests for autonomous service rerouting

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

5 weeks agoSwitch tests from nose to pytest 68/101768/2
guillaume.lambert [Thu, 7 Jul 2022 14:06:14 +0000 (16:06 +0200)]
Switch tests from nose to pytest

nose is going to be deprecated.

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

5 weeks agoUpgrade Honeynode sim version 39/101739/2
Thierry Jiao [Tue, 5 Jul 2022 12:29:26 +0000 (14:29 +0200)]
Upgrade Honeynode sim version

Upgrade Honeynode version for device 2.2.1 and 7.1.0

Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: Ib9b6a83c0800569a2e948a9d86051fea3b3bd84c

5 weeks agoRefactor networkmodel OpenRoadmTopology Part 4 51/101751/1
guillaume.lambert [Wed, 6 Jul 2022 08:12:44 +0000 (10:12 +0200)]
Refactor networkmodel OpenRoadmTopology Part 4

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

5 weeks agoMigrate OTN E2E functional tests to RFC8040 step 1 38/101738/5
guillaume.lambert [Tue, 5 Jul 2022 09:57:23 +0000 (11:57 +0200)]
Migrate OTN E2E functional tests to RFC8040 step 1

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

5 weeks agoRefactor networkmodel OpenRoadmTopology Part 3 21/101721/2
guillaume.lambert [Mon, 4 Jul 2022 19:01:20 +0000 (21:01 +0200)]
Refactor networkmodel OpenRoadmTopology Part 3

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

5 weeks agoRefactor networkmodel OpenRoadmTopology Part 2 15/101715/6
guillaume.lambert [Mon, 4 Jul 2022 09:10:48 +0000 (11:10 +0200)]
Refactor networkmodel OpenRoadmTopology Part 2

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

5 weeks agoRefactor networkmodel OpenRoadmTopology Part 1 97/101597/30
Quentin Saillard [Mon, 4 Jul 2022 07:47:01 +0000 (09:47 +0200)]
Refactor networkmodel OpenRoadmTopology Part 1

Change-Id: Ie45fb713f1df0bb0b84e94da25b3a6838a4eeefd
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 weeks agoMerge "Fix PceCalculation bug when validating nodes"
Guillaume Lambert [Tue, 5 Jul 2022 07:11:44 +0000 (07:11 +0000)]
Merge "Fix PceCalculation bug when validating nodes"

5 weeks agoMerge changes from topic "fix_bugs"
Gilles Thouenon [Mon, 4 Jul 2022 10:42:31 +0000 (10:42 +0000)]
Merge changes from topic "fix_bugs"

* changes:
  Update ServicehandlerImplTest
  Fix bug service-create

5 weeks agoUpdate ServicehandlerImplTest 21/101621/3
Thierry Jiao [Wed, 22 Jun 2022 12:51:04 +0000 (14:51 +0200)]
Update ServicehandlerImplTest

- Refactor the redundant variables
- Add Unit test for service-create when service already exists in
DataStore

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

6 weeks agoFix PceCalculation bug when validating nodes 47/101647/4
Thierry Jiao [Thu, 30 Jun 2022 07:31:41 +0000 (09:31 +0200)]
Fix PceCalculation bug when validating nodes

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

6 weeks agoMerge "Bump lighty.io build to Sulfur"
Guillaume Lambert [Fri, 1 Jul 2022 10:08:43 +0000 (10:08 +0000)]
Merge "Bump lighty.io build to Sulfur"

6 weeks agoBump lighty.io build to Sulfur 48/101648/3
guillaume.lambert [Thu, 30 Jun 2022 17:50:20 +0000 (19:50 +0200)]
Bump lighty.io build to Sulfur

Version 16.0.0 for Sulfur is available.
Thought, lighty.io cannot be enforced in the CI yet.
Most tests still do not pass with it.

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

6 weeks agoFix bug service-create 20/101620/2
Thierry Jiao [Wed, 22 Jun 2022 07:53:43 +0000 (09:53 +0200)]
Fix bug service-create

When creating a new service with service-create RPC, ServiceHandlerImpl
will now check that there are no existing services with the same name
in the datastore.

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

6 weeks agoMerge "Update project version for Chlorine release train"
Guillaume Lambert [Thu, 30 Jun 2022 12:25:12 +0000 (12:25 +0000)]
Merge "Update project version for Chlorine release train"

6 weeks agoUpdate project version for Chlorine release train 44/101644/2
guillaume.lambert [Thu, 30 Jun 2022 09:46:04 +0000 (11:46 +0200)]
Update project version for Chlorine release train

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

6 weeks agoUpdate docs conf.yaml version to Sulfur 42/101642/1
guillaume.lambert [Thu, 30 Jun 2022 08:26:10 +0000 (10:26 +0200)]
Update docs conf.yaml version to Sulfur

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

6 weeks agoFix some indentations issues in OpenRoadmTopology 44/101544/25
Quentin [Fri, 3 Jun 2022 09:41:58 +0000 (11:41 +0200)]
Fix some indentations issues in OpenRoadmTopology

Several parts of the current code show high cyclomatic complexity.
Some of them still use old Java coding style patterns.

Change-Id: Ib434ef68b9b32f74bbc1132005c8d319a6d4ecca
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
6 weeks agoRefactor SH NetworkModelListenerImpl 84/101584/6
guillaume.lambert [Tue, 14 Jun 2022 13:55:10 +0000 (15:55 +0200)]
Refactor SH NetworkModelListenerImpl

JIRA: TRNSPRTPCE-668, TRNSPRTPCE-669
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I53b901247953aa19a9e4c5a462097183cedd99c0

6 weeks agoImplement an autonomous service rerouting 85/101585/7
Thierry Jiao [Tue, 24 May 2022 07:42:16 +0000 (09:42 +0200)]
Implement an autonomous service rerouting

If the OperationalState of a service becomes 'outOfService',
the service will be rerouted through the following process :

  - 1) Complete deletion of the service
  - 2) Recreation of the service with a new path

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

6 weeks agoAdd service-resiliency compliance check 83/101583/7
Thierry Jiao [Fri, 10 Jun 2022 13:17:22 +0000 (15:17 +0200)]
Add service-resiliency compliance check

- Implement new method of compliance check dedicated to
service-resiliency input
- Add JUnit test of this new method

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

6 weeks agoAdd service-resiliency handling in service-create 82/101582/7
Thierry Jiao [Wed, 8 Jun 2022 12:43:54 +0000 (14:43 +0200)]
Add service-resiliency handling in service-create

Add possibility to specify the service-resiliency attribute
in the input of the service-create RPC.

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

6 weeks agoFix issues in listeners 54/101454/6
Thierry Jiao [Wed, 25 May 2022 14:31:58 +0000 (16:31 +0200)]
Fix issues in listeners

- In PortMappingListener, change the predicate that conditions
the topology update
- In NetworkModelListener, update only the OperationalState of
the service after the topology update (and no longer the AdminState)
- Update the functional tests accordingly
- Add JUnit tests for PortMappingListener & NetworkModelListenerImpl

JIRA: TRNSPRTPCE-668, TRNSPRTPCE-669
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: Ifbc4402794830fa6e060f8f3c60132dc05e803ba

6 weeks agoRefactor tapi-delete-connectivity service rpc 74/100474/12
Javier Errea [Thu, 7 Apr 2022 13:53:30 +0000 (15:53 +0200)]
Refactor tapi-delete-connectivity service rpc

- Delete connections from connectivity-context
  on delete-tapi-connectivity-service
- Add check to verify that the connection is not
  used by another service before deletion
- Delete only connections that correspond to the
  connectivity service layer

JIRA: TRNSPRTPCE-650
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: Id9a31ca595156d93b59fded7476442614e3d9e07

6 weeks agoUpdate TAPI Connectivity Service on port change 37/97437/30
Javier Errea [Mon, 2 Aug 2021 12:27:01 +0000 (14:27 +0200)]
Update TAPI Connectivity Service on port change

- Update TAPI connections & connectivity service
  on topology update notification
- Update TAPI supported connectivity services (infrastructure)
- Update CEPs of connections
- Add tapiNetworkModelListener to TapiProvider class
- Refactor TAPI connection creation to include lower connections
- Add method for sending a notification on a TAPI topology update
- Refactor differentiation between SWITCH and MUXPDR connectivity
  service creation
- Refactor connectivity service creation when there is
  more than 1 ROADM between end points of the service

JIRA: TRNSPRTPCE-466
Change-Id: I95f7dfba0d9d01c48e60538b215890265d48cf19
Signed-off-by: errea <errea@eurecom.fr>
6 weeks agoUpdate TAPI Topology Service on port change 36/97436/29
Javier Errea [Mon, 2 Aug 2021 10:01:05 +0000 (12:01 +0200)]
Update TAPI Topology Service on port change

- PortMappingListener triggers TAPI topo update on port change
- Update TAPI NEPs, SIPs & Links on port change

JIRA: TRNSPRTPCE-466
Change-Id: I17d0b80a78a6154cd7bb1ceffd861e186c90a30a
Signed-off-by: errea <errea@eurecom.fr>
7 weeks agoUpdating the usage section of the developer guide 16/101516/4
Roshan Joyce [Thu, 9 Jun 2022 06:25:20 +0000 (11:55 +0530)]
Updating the usage section of the developer guide

The URIs mentioned in the developer guide has some
errors. Corrected them with working URIs based on
RFC8040.

Signed-off-by: Roshan Joyce <roshan.joyce@fujitsu.com>
Change-Id: I58add6fcb96a8017be22d46e48682532b119ba2f

8 weeks agoChange LOG level in PCE 48/99548/12
Gilles Thouenon [Tue, 1 Feb 2022 17:00:07 +0000 (18:00 +0100)]
Change LOG level in PCE

Change most of LOG messages of PCE from Info to Debug level.

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

8 weeks agoChange log level in MappingUtilsImpl 47/99547/12
Gilles Thouenon [Tue, 1 Feb 2022 16:50:20 +0000 (17:50 +0100)]
Change log level in MappingUtilsImpl

Change part of log messages from info to debug.

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

8 weeks agopce(gnpy) for Sulfur 00/101300/18
wede7391 [Wed, 25 May 2022 20:26:53 +0000 (22:26 +0200)]
pce(gnpy) for Sulfur

- replace jackson module with MessageBodyWriter and MessageBodyReader
 to avoid intermediate String (fix scientific notation for decimal)
- add createDataObjectFromInputStream to JsonConverter
- put decimal value in gnpy test data

JIRA: TRNSPRTPCE-639
Signed-off-by: wede7391 <emmanuelle.delfour@orange.com>
Change-Id: I4399bf1004709860796884e3c990c8466cf57ca8

8 weeks agoQuick and dirty fix to sulfur build problems in CI 61/100861/24
guillaume.lambert [Thu, 28 Apr 2022 09:21:20 +0000 (11:21 +0200)]
Quick and dirty fix to sulfur build problems in CI

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

8 weeks agoAdapt TransportPCE code to Sulfur 46/100646/27
Gilles Thouenon [Wed, 13 Apr 2022 15:10:18 +0000 (17:10 +0200)]
Adapt TransportPCE code to Sulfur

- modify InstanceIdentifier creation using builderOfInherited() method
- replace BigDecimal by Decimal64
- adapt some RpcResultBuilder
- replace List by Set wherever it was necesary
- adapt values format used in input files of UT to Decimal64
- disable few UT still failing
- disable lighty build from the CI

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

8 weeks agoBump upstream dependencies to S-SR1 33/100633/15
Gilles Thouenon [Thu, 31 Mar 2022 07:22:21 +0000 (09:22 +0200)]
Bump upstream dependencies to S-SR1

Adopt:
- odlparent-10.0.2
- yangtools-8.0.6
- mdsal-9.0.4
- netconf-3.0.5

Also,
- remove useless power-mock dependencies from olm and pce modules

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

8 weeks agoupdate pce yang model 00/101600/1
manuedelf [Thu, 16 Jun 2022 13:19:35 +0000 (15:19 +0200)]
update pce yang model

change fraction digits from 2 to 6 for accumulative-value leaf
from 2 to 6 to be compliant with Gnpy

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

8 weeks agofix gnpy model 95/101595/2
manuedelf [Wed, 15 Jun 2022 14:03:49 +0000 (16:03 +0200)]
fix gnpy model

- change fraction digits from 2 to 6 for accumulative-value leaf
- update unit test data file
- update gnpy4tpce version to be compliant

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

8 weeks agofix funcional test issue when list in dict 90/101290/4
Gilles Thouenon [Wed, 25 May 2022 13:27:31 +0000 (15:27 +0200)]
fix funcional test issue when list in dict

Adapt few functional test to be able to compare dictionaries containing
list, where order of items inside the list is taken into acount.

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

2 months agoMerge "Use Maven 3.8.6 in CI CentOS install script"
Guillaume Lambert [Tue, 14 Jun 2022 07:49:54 +0000 (07:49 +0000)]
Merge "Use Maven 3.8.6 in CI CentOS install script"

2 months agoUse Maven 3.8.6 in CI CentOS install script 72/101572/2
guillaume.lambert [Mon, 13 Jun 2022 09:38:14 +0000 (11:38 +0200)]
Use Maven 3.8.6 in CI CentOS install script

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

2 months agoFix the pom files to compile in Windows OS 45/101545/2
Balagangadhar Bathula [Thu, 9 Jun 2022 14:26:48 +0000 (10:26 -0400)]
Fix the pom files to compile in Windows OS

- Windows machines do not recognize paths in
  certain pom.xml files

Change-Id: I8178841141d23a61dca90f4c719ac39409b18766
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
2 months agoMerge "Remove SupportedIfCapability conversion from TAPI"
Guillaume Lambert [Thu, 2 Jun 2022 14:58:15 +0000 (14:58 +0000)]
Merge "Remove SupportedIfCapability conversion from TAPI"

2 months agoMerge changes Idfae5b92,Ibc4de535,Iad341cb0,I5e0be59b,Id51f6680
Guillaume Lambert [Thu, 2 Jun 2022 14:50:50 +0000 (14:50 +0000)]
Merge changes Idfae5b92,Ibc4de535,Iad341cb0,I5e0be59b,Id51f6680

* changes:
  Refactor DpQpsk/DpQam16 100G OFEC support
  Renderer functional tests for 200G rate 31.6 Gbaud
  Fix bug in 200G 31.6 GBaud renderer
  Functional tests for 100 OFEC 31.6 GBaud
  Add support for 100G OFEC

2 months agoMerge "Update GNPy version used for functional tests"
Gilles Thouenon [Thu, 2 Jun 2022 14:30:32 +0000 (14:30 +0000)]
Merge "Update GNPy version used for functional tests"

2 months agoRemove SupportedIfCapability conversion from TAPI 47/100447/3
Gilles Thouenon [Thu, 7 Apr 2022 11:55:04 +0000 (13:55 +0200)]
Remove SupportedIfCapability conversion from TAPI

With change https://git.opendaylight.org/gerrit/c/transportpce/+/100135,
conversions of SupportedIfCapability should have been removed.
Remove useless conversion methods.

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

2 months agoRefactor DpQpsk/DpQam16 100G OFEC support 18/101318/2
guillaume.lambert [Sat, 28 May 2022 14:52:43 +0000 (16:52 +0200)]
Refactor DpQpsk/DpQam16 100G OFEC support

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

2 months agoRenderer functional tests for 200G rate 31.6 Gbaud 04/101304/2
Balagangadhar Bathula [Thu, 26 May 2022 16:27:34 +0000 (12:27 -0400)]
Renderer functional tests for 200G rate 31.6 Gbaud

- Renderer service-path create and delete
- Fix a minor bug

JIRA: TRNSPRTPCE-637
Change-Id: Ibc4de5354e1188dec792fbc719513e4261d47312
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
2 months agoFix bug in 200G 31.6 GBaud renderer 03/101303/1
Balagangadhar Bathula [Thu, 26 May 2022 11:35:57 +0000 (07:35 -0400)]
Fix bug in 200G 31.6 GBaud renderer

- Instance ID for 200G OTSi group should be
  2 not 4.
- Fix the issue with interface naming when the
  source-tp is not null and has network-token

Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Iad341cb0f4357feb8288141d87b3348fb03f3f6d

2 months agoFunctional tests for 100 OFEC 31.6 GBaud 78/101278/3
Balagangadhar Bathula [Tue, 24 May 2022 17:03:39 +0000 (13:03 -0400)]
Functional tests for 100 OFEC 31.6 GBaud

- Update the configuration files with the new
  capabilities for 100G OFEC.
- Add functional tests to render the 100G 31.6 Gbaud
  (50 GHz) interfaces.

JIRA: TRNSPRTPCE-637

Change-Id: I5e0be59be3a2dcc41f276078020ed9e2b66b588a
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
2 months agoUpdate GNPy version used for functional tests 91/101291/1
Gilles Thouenon [Wed, 25 May 2022 14:04:21 +0000 (16:04 +0200)]
Update GNPy version used for functional tests

Adopt gnpy4tpce-2.4.5 that integrates number of fixes from official GNPy
application.

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

2 months agoAdd support for 100G OFEC 37/100837/4
Balagangadhar Bathula [Wed, 27 Apr 2022 10:56:30 +0000 (06:56 -0400)]
Add support for 100G OFEC

- Interface hierarchy follows B100G model
  (OTSI-OTSIGROUP-OTUC1-ODUC1-ODU4)
- Update the device renderer delete operation
- Add the if-OTU4-ODU4 capability class

JIRA: TRNSPRTPCE-636
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Id51f6680eca30d4a544f94d3d814b18c9e781484

2 months agoBump upstream dependencies to P-SR3 46/101246/1
Gilles Thouenon [Thu, 19 May 2022 15:50:33 +0000 (17:50 +0200)]
Bump upstream dependencies to P-SR3

Adopt:
- odlparent-9.0.15
- yangtools-7.0.17
- mdsal-8.0.15
- netconf-2.0.16

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

3 months agoMerge changes Id2470baf,If169e9fc
Guillaume Lambert [Thu, 12 May 2022 12:48:35 +0000 (12:48 +0000)]
Merge changes Id2470baf,If169e9fc

* changes:
  Reenforce Lighty build in the gate
  Use draft-bierman02 REST in [12].2.1 func tests

3 months agoMerge "Fix bug when creating SRG termination points"
Guillaume Lambert [Wed, 11 May 2022 07:02:48 +0000 (07:02 +0000)]
Merge "Fix bug when creating SRG termination points"

3 months agoMerge "Fix failure in nbinotifications functional tests"
Guillaume Lambert [Wed, 11 May 2022 06:45:59 +0000 (06:45 +0000)]
Merge "Fix failure in nbinotifications functional tests"

3 months agoFix bug when creating SRG termination points 17/101017/2
Jonas Mårtensson [Mon, 9 May 2022 18:57:08 +0000 (20:57 +0200)]
Fix bug when creating SRG termination points

When a ROADM node includes multiple SRGs such as SRG1, SRG10, SRG11,
etc., the termination points (tp-id) created under SRG1 in the
openroadm topology included erroneous entries such as SRG10-PPn-TXRX
under SRG1. This was caused by the createTopologyShard method filtering
and selecting all logical connection points in the port mapping list
containing SRG1 as a substring which is also true for SRG10, SRG11,
etc. With this patch, the whole string before the first "-" is used for
comparison instead.
Also, add a specific UT to check this use case.

JIRA: TRNSPRTPCE-664
Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
Change-Id: Iab2802e1bac4e48aafeb4518d876c32b990742c3

3 months agoReenforce Lighty build in the gate 81/100981/3
Gilles Thouenon [Wed, 4 May 2022 08:45:48 +0000 (10:45 +0200)]
Reenforce Lighty build in the gate

JIRA: TRNSPRTPCE-579
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Id2470baf85998e17fe31fab311297d8c6b2a590b
(cherry picked from commit 8f0a3f2cafdd513debca00aaa27c2970732b92bb)

3 months agoUse draft-bierman02 REST in [12].2.1 func tests 80/100980/2
guillaume.lambert [Fri, 6 May 2022 10:25:52 +0000 (12:25 +0200)]
Use draft-bierman02 REST in [12].2.1 func tests

This is needed prior to enforce lighty.io use in the CI.

JIRA: TRNSPRTPCE-579
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If169e9fcd7b3593016adfccaad9a0e2c35608235
(cherry picked from commit f7ee42e61bc62ae5cb4f0400109e00b427481861)

3 months agoUpdate network models revision to 10.1 in lighty 49/101049/3
Gilles Thouenon [Tue, 10 May 2022 09:36:52 +0000 (11:36 +0200)]
Update network models revision to 10.1 in lighty

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

3 months agoAdapt lighty to run with optional karaf features 79/100979/2
Gilles Thouenon [Sun, 8 May 2022 16:45:28 +0000 (18:45 +0200)]
Adapt lighty to run with optional karaf features

- put tapi as an optional feature to install in lighty, as it is the
  case with karaf
- add use of two new environment variables (INSTALL_NBINOTIFICATIONS and
  INSTALL_TAPI) to start lighty with nbinotifications and tapi features
- adapt lighty launcher shell script to take into acount these
  environment variables, as well as the OLM_TIMER ones
- adapt tox consequently

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

3 months agoExtract in CI tapi functional tests from tests221 78/100978/3
Gilles Thouenon [Mon, 9 May 2022 08:30:42 +0000 (10:30 +0200)]
Extract in CI tapi functional tests from tests221

That allows to manage TAPI as an optional feature in lighty build, as it
is the case with karaf and nbinotifications.
- create a new tests_tapi tox profile
- move the current two functional test suites in the new
  'transportpce_tests/tapi' directory
- run tapi functional tests first

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

3 months agoFix failure in nbinotifications functional tests 77/100977/4
Gilles Thouenon [Sat, 7 May 2022 16:17:29 +0000 (18:17 +0200)]
Fix failure in nbinotifications functional tests

To take into acount pce bug corrections solved in change
https://git.opendaylight.org/gerrit/c/transportpce/+/99459.

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

3 months agoUpgrade honeynode version 74/100974/1
Gilles Thouenon [Tue, 3 May 2022 17:09:12 +0000 (19:09 +0200)]
Upgrade honeynode version

This new version of honeynode contains nc-notifications yang module to
allow running device notifications functional tests with lighty.

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

3 months agoBump lighty to P-SR2 73/100973/1
Gilles Thouenon [Tue, 3 May 2022 15:41:13 +0000 (17:41 +0200)]
Bump lighty to P-SR2

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

3 months agoClean yang modules instanciations in lighty 72/100972/2
Gilles Thouenon [Tue, 3 May 2022 15:38:05 +0000 (17:38 +0200)]
Clean yang modules instanciations in lighty

- fix revisions of yang modules
- add nc-notifications module

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

3 months agoAdd new method in PortMapping interface 71/100971/1
Gilles Thouenon [Tue, 3 May 2022 15:35:11 +0000 (17:35 +0200)]
Add new method in PortMapping interface

To be able to get PortMappingVersion710 instance, necessary to
instanciate OpenRoadmInterfacesImpl710 object in lighty.

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

3 months agoRemove an irrelevant UT from PCE 91/100891/2
Gilles Thouenon [Fri, 29 Apr 2022 12:30:52 +0000 (14:30 +0200)]
Remove an irrelevant UT from PCE

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

3 months agoFix few code issues 65/100865/3
Gilles Thouenon [Thu, 28 Apr 2022 12:48:09 +0000 (14:48 +0200)]
Fix few code issues

- remove useless property from DeviceRendererServiceImpl
- remove several catching of NPE

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

3 months agoFix List initialisation issue in Renderer 64/100864/2
Gilles Thouenon [Thu, 28 Apr 2022 12:18:16 +0000 (14:18 +0200)]
Fix List initialisation issue in Renderer

Avoid usage of anonymous class

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

3 months agoMerge "Drop the service name from ODU connection name"
Gilles Thouenon [Mon, 2 May 2022 09:09:37 +0000 (09:09 +0000)]
Merge "Drop the service name from ODU connection name"

3 months agoMerge "Fix output response for 400GE device renderer"
Gilles Thouenon [Mon, 2 May 2022 09:09:12 +0000 (09:09 +0000)]
Merge "Fix output response for 400GE device renderer"

3 months agoUpdate Maven CentOS install script for tests 60/100860/1
guillaume.lambert [Thu, 28 Apr 2022 08:43:18 +0000 (10:43 +0200)]
Update Maven CentOS install script for tests

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

3 months agoFix output response for 400GE device renderer 43/100643/4
Balagangadhar Bathula [Tue, 19 Apr 2022 03:31:02 +0000 (23:31 -0400)]
Fix output response for 400GE device renderer

- Output indicates all the interfaces created,
  OTSI, OTSI-group, OTUC4, ODUC4, ODUFlex and
  Ethernet-client

JIRA: TRNSPRTPCE-606
Change-Id: Ic336a6223b4adc23e0f61b4bc33114af950ddcd9
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoDrop the service name from ODU connection name 30/100830/1
Balagangadhar Bathula [Tue, 26 Apr 2022 21:26:10 +0000 (17:26 -0400)]
Drop the service name from ODU connection name

- With service name appended to the network and client
  side interfaces, the ODU connection names are longer
- Though there is not restriction in the string length
  from OpenROADM MSA, it is better to keep total bytes
  256.

JIRA: TRNSPRTPCE-628

Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I6149a9c8db18e1de9b939db64f5c12a964a98be0

4 months agoUse sphinx keep-going option in docs tox jobs 30/100430/2
guillaume.lambert [Wed, 6 Apr 2022 08:56:46 +0000 (10:56 +0200)]
Use sphinx keep-going option in docs tox jobs

Without this option, sphinx stops at the first warning found
when -W option is enabled.
This prevents users from troubleshooting their contributions in 1 pass.

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

4 months agoAdd TE metrics UT to SH DowngradeConstraints Junit 16/100416/2
guillaume.lambert [Tue, 5 Apr 2022 13:00:35 +0000 (15:00 +0200)]
Add TE metrics UT to SH DowngradeConstraints Junit

Junit was only testing WDM TE metrics but not OTN ones.

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

4 months agoRefactor SH ConstraintsUtils test class 83/100383/2
guillaume.lambert [Mon, 4 Apr 2022 13:55:01 +0000 (15:55 +0200)]
Refactor SH ConstraintsUtils test class

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

4 months agoRefactor ServiceHandler DowngradeConstraints 81/100381/2
guillaume.lambert [Mon, 4 Apr 2022 10:46:06 +0000 (12:46 +0200)]
Refactor ServiceHandler DowngradeConstraints

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

4 months agoFix SH DowngradeConstraints max OTN Hop count bug 80/100380/2
guillaume.lambert [Mon, 4 Apr 2022 10:49:06 +0000 (12:49 +0200)]
Fix SH DowngradeConstraints max OTN Hop count bug

WDM hop count setter was used both for WDM and OTN constraints
- use OTN hop count setter for OTN constraints

Junit was only testing WDM hop count and TE metrics but not OTN ones.
- add OTN parameters to tests constraints util class
- add OTN Hop Count Junit tests

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

4 months agoRefactor SupportedIfCapability usage 35/100135/6
Gilles Thouenon [Wed, 16 Mar 2022 13:21:04 +0000 (14:21 +0100)]
Refactor SupportedIfCapability usage

Use the latest version of interface capabilities defined in
org-openroadm-port-types model everywhere in TransportPCE code.
- update portmapping model to import latest org-openroadm-port-types
  version used with 10.1 models
- use ifCapability conversion only in portmapping implementation to make
  the adaptation with different device versions
- remove duplicated ifCapability conversions performed in networkmodel
  and tapi modules

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

4 months agoUpgrade openroadm network models to 10.1 01/99601/6
Christophe Betoule [Fri, 4 Feb 2022 16:30:36 +0000 (17:30 +0100)]
Upgrade openroadm network models to 10.1

- upgrade network models to 10.1
- add new required 10.1 models from common
- update java code accordingly to these new models
- update UT

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

4 months agoRewrite the whole DowngradeConstraintsTest class 84/99684/7
Gilles Thouenon [Thu, 10 Feb 2022 13:33:12 +0000 (14:33 +0100)]
Rewrite the whole DowngradeConstraintsTest class

- rewrite DowngradeConstraintsTest class to take into acount new
constraints appreared with service-models 10.1
- complement and fix implementation issues in DowngradeConstraints class

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

4 months agoRefactor style b/c of service models 10.1 update 34/99834/15
guillaume.lambert [Mon, 21 Feb 2022 13:15:16 +0000 (14:15 +0100)]
Refactor style b/c of service models 10.1 update

Some pieces of the current code do not follow any coherent coding style
pattern.
Some others still use old Java coding style patterns,
mainly old patterns used before builders and setters could be cascaded.

A coherent and clean coding style matters because
- it eases the code maintenance and evolution
- it also helps detect errors or possible optimizations

For this reason, coding style issues should preferably be adressed
before any in-depth modifications such as API migrations.
And if not possible, at least afterwards.
This is particularly true with the YANG models API used here.
They generate long namespaces and long builders/setters structures
that can quickly burden the code and complicate its reading or analysis.

As a consequence, the style of some pieces of code was reviewed here to
- correct indentations
- rework LF positions
- fix split NS and revision dates
- add ternary operator where it makes senses
- rearrange and cascade builders and setters

Once that done, some optimizations have been proposed on the fly to:
- remove some intermediate variables that are not needed
- remove related imports no more used
- add imports to avoid to use long NS in code blocks
- etc

Finally add TODO comments on few places that might need to be reworked.

https://en.wikipedia.org/wiki/Programming_style

JIRA: TRNSPRTPCE-586 TRNSPRTPCE-205
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I14f5f40dfdf97fa0f32139d384db878e2932fc04

4 months agoUpgrade openroadm service models to 10.1 59/98859/15
Gilles Thouenon [Fri, 26 Nov 2021 16:37:23 +0000 (17:37 +0100)]
Upgrade openroadm service models to 10.1

- upgrade service models to 10.1
- add few required 10.1 related models in common
- update java code accordingly to these new models
- update UT and functional tests

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

4 months agoRemove transportpce-routing-constraint model 80/99380/14
Gilles Thouenon [Wed, 19 Jan 2022 12:01:44 +0000 (13:01 +0100)]
Remove transportpce-routing-constraint model

- replace internal redundant transportpce-routing-constraints model by
the official openroadm-routing-constraints one
- remove unecessary mapping class in servicehandler that was converting
routing-constraints from openroadm to transportpce types
- adapt other code, UT and functional tests consequently

NB: This change is the following of change
https://git.opendaylight.org/gerrit/c/transportpce/+/99379, and they
should be cherry-picked together to guarantee YANG revision dates
coherency.

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