transportpce.git
13 days agoMerge changes Id2470baf,If169e9fc master
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

2 weeks 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"

2 weeks 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"

2 weeks 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

2 weeks 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)

2 weeks 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)

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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

4 weeks 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>
4 weeks 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

6 weeks 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

7 weeks 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

7 weeks 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

7 weeks 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

7 weeks 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

7 weeks 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

7 weeks 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

7 weeks 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

8 weeks 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

8 weeks 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

8 weeks 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

8 weeks agoRefactor transportpce-routing-constraint model 79/99379/13
Gilles Thouenon [Tue, 18 Jan 2022 08:55:36 +0000 (09:55 +0100)]
Refactor transportpce-routing-constraint model

- extract enumeration pce-metric from transportpce-routing-constraints
to transportpce-common-service-path-type, and use it as
pce-routing-metric
- adapt code, UT and functional tests consequently
- update model revisions and imports in TPCE code

NB: this refactor is a preliminary step to replace the
transportpce-routing-constraints model by openroadm-routing-constraints
one (done in change
https://git.opendaylight.org/gerrit/c/transportpce/+/99380), 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: I93b26ee4e4b45fd06a6459010b115910a84aef68

8 weeks agoFix pylint issue in pce functional tests 89/100289/1
Gilles Thouenon [Wed, 30 Mar 2022 14:06:34 +0000 (16:06 +0200)]
Fix pylint issue in pce functional tests

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

2 months agoRefactor func tests transportpce api rpc calls 2/2 49/100149/2
guillaume.lambert [Fri, 18 Mar 2022 17:37:35 +0000 (18:37 +0100)]
Refactor func tests transportpce api rpc calls 2/2

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

2 months agoRefactor func tests transportpce api rpc calls 1/2 47/100147/3
guillaume.lambert [Fri, 18 Mar 2022 10:52:13 +0000 (11:52 +0100)]
Refactor func tests transportpce api rpc calls 1/2

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

2 months agoMigrate OLM functional tests to RFC8040 step 2 39/100139/4
guillaume.lambert [Thu, 17 Mar 2022 10:42:31 +0000 (11:42 +0100)]
Migrate OLM functional tests to RFC8040 step 2

- migrate test_utils create_ots_oms_function to RFC8040
- migrate some transportPCE internal API olm RPC calls to test_utils:
  - get-pm
  - calculate-spanloss-base
  - calculate-spanloss-current
  - service-power-setup
  - service-power-turndown
- clean up a few pieces of code

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

2 months agoMigrate OLM functional tests to RFC8040 step 1 20/100120/9
guillaume.lambert [Mon, 14 Mar 2022 10:54:07 +0000 (11:54 +0100)]
Migrate OLM functional tests to RFC8040 step 1

- migrate functions used by OLM tests already in new test_utils_rfc8040
- clean up a few pieces of code

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

2 months agoRefactor PCE networkanalyzer PceCalculation 61/100061/8
guillaume.lambert [Thu, 10 Mar 2022 20:30:15 +0000 (21:30 +0100)]
Refactor PCE networkanalyzer PceCalculation

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

2 months agoManage 100GE on XPDR with a list of xponder 84/99784/15
Christophe Betoule [Tue, 15 Mar 2022 17:40:59 +0000 (18:40 +0100)]
Manage 100GE on XPDR with a list of xponder

- Manage the case when a 100GE service is created between specific ports
(port-name, port-device-name) set in the service-create request on XPDR
with a list of xponder
- Adapt func tests consequently

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

2 months agoAdd a list of xponder for XPDR-C1 42/100142/4
Christophe Betoule [Mon, 14 Mar 2022 14:21:40 +0000 (15:21 +0100)]
Add a list of xponder for XPDR-C1

- Adapt XPDR-C1 with a list of 2 xponder, each of them having 1 client
port and 1 network port
- Disable some 221 end2end tests until JIRA TRNSPRTPCE-643 is solved

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

2 months agoUpdate Servicehandler checks 41/100141/4
Christophe Betoule [Mon, 14 Mar 2022 10:17:54 +0000 (11:17 +0100)]
Update Servicehandler checks

Update Tx/Rx service handler checks to be compliant with service models
of openROADM MSA

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

2 months agoBug correction for the ethernet loop test 40/100140/3
Christophe Betoule [Fri, 11 Mar 2022 15:03:38 +0000 (16:03 +0100)]
Bug correction for the ethernet loop test

- Adapt the body of the service request for the ethernet loop test to
really create an ethernet service
- Decrease the number of loops from 6 to 3

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

2 months agoFix a RFC8040 test utils method naming 38/100138/2
guillaume.lambert [Thu, 17 Mar 2022 10:18:58 +0000 (11:18 +0100)]
Fix a RFC8040 test utils method naming

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

2 months agoReintroduce netmod dependency 36/99936/6
guillaume.lambert [Wed, 2 Mar 2022 21:20:14 +0000 (22:20 +0100)]
Reintroduce netmod dependency

Many devices do not advertise netmod capabilities,
which caused error for subscription.
The previous fix removed netmod dependency.

- reintroduce the netmod dependency
- handle non-compliant devices
  by catching empty list of supported streams and so on
- ensure OpenROADM streams subscriptions are tested first
  before testing NetCONF streams

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

2 months agoFix notification subscription issue 59/99859/7
Balagangadhar Bathula [Thu, 24 Feb 2022 18:15:53 +0000 (13:15 -0500)]
Fix notification subscription issue

Many devices do not advertise netmod capabilities,
which causes error for subscription.

- fix code to remove netmod dependency
- refactor networkmodel NetConfTopologyListener

JIRA: TRNSPRTPCE-621
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Ieebf7d893fb6050af3ca89db68ca47f145014211
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
2 months agoUpdate karaf cache nc-notifications YANG schema 46/97246/8
Vachhani, Shweta (sv111y) [Wed, 18 Aug 2021 11:51:34 +0000 (13:51 +0200)]
Update karaf cache nc-notifications YANG schema

https://github.com/sysrepo/sysrepo/issues/2365

JIRA: TRNSPRTPCE-493
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I52050644ac9e05b9edc46f589ac613f759201d45
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
2 months agoFix power value precision bug 04/100004/2
guillaume.lambert [Tue, 8 Mar 2022 14:19:55 +0000 (15:19 +0100)]
Fix power value precision bug

According to YANG model the target-output-power has a precision of 2.
This is not enforced when mcWidth is different than 50GHz
or not precised.

- Move power value rounding after this case to always have 2 precision
- Factorize and improve log accordingly

JIRA: TRNSPRTPCE-623
Co-authored-by: Balagangadhar Bathula <bb4341@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If44b7d94d31461aacb0e6910b6be89a3dff2ac0a

2 months agoMerge changes Icd0ec3e4,Ied393b60,I117bfce8,Ia8e86650,Id583e292
Guillaume Lambert [Mon, 7 Mar 2022 08:05:55 +0000 (08:05 +0000)]
Merge changes Icd0ec3e4,Ied393b60,I117bfce8,Ia8e86650,Id583e292

* changes:
  Clean JUnit tests
  Remove usage of DOMNotificationRouter.create meth
  Remove usage of deprecated initMocks method
  Clean dependency declaration in common module
  Remove usage of SchemaPath from converters

2 months agoClean JUnit tests 50/99950/2
Gilles Thouenon [Thu, 3 Mar 2022 16:23:21 +0000 (17:23 +0100)]
Clean JUnit tests

- remove useless properties
- remove useless intermediate variables
- remove useless private methods

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

2 months agoRefactor PCE network analyzer PceOtnNode step 9 20/99920/4
guillaume.lambert [Tue, 1 Mar 2022 13:28:16 +0000 (14:28 +0100)]
Refactor PCE network analyzer PceOtnNode step 9

Define some constants for valid mode types as advised by Sonar.

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

2 months agoRefactor PCE network analyzer PceOtnNode step 8 83/99883/4
guillaume.lambert [Mon, 28 Feb 2022 11:53:10 +0000 (12:53 +0100)]
Refactor PCE network analyzer PceOtnNode step 8

Refactor some checks and add a new method mainly on the purpose
to decrease the initXndrTps() method cyclomatic complexity
currently warned by Sonar

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

2 months agoRemove usage of DOMNotificationRouter.create meth 49/99949/1
Gilles Thouenon [Thu, 3 Mar 2022 12:50:57 +0000 (13:50 +0100)]
Remove usage of DOMNotificationRouter.create meth

Since this method is marked as deprecated and for removal, change the
way to instanciate a DOMNotificationRouter object.

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

2 months agoRemove usage of deprecated initMocks method 48/99948/1
Gilles Thouenon [Thu, 3 Mar 2022 12:48:23 +0000 (13:48 +0100)]
Remove usage of deprecated initMocks method

Replace deprecated initMocks method used in JUnit tests by openMocks
method.

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

2 months agoClean dependency declaration in common module 47/99947/1
Gilles Thouenon [Thu, 3 Mar 2022 12:43:59 +0000 (13:43 +0100)]
Clean dependency declaration in common module

To remove warnings during compilation.

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

2 months agoRemove usage of SchemaPath from converters 22/99922/3
Gilles Thouenon [Fri, 25 Feb 2022 17:12:46 +0000 (18:12 +0100)]
Remove usage of SchemaPath from converters

- Update code of JSON/XML serializer/deserializer to not use anymore the
SchemaPath object coming from yangtools, because it is marked as
deprecated and should be removed in Sulfur.
- Bump GNPy version to 2.4.3

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

2 months agoBump kafka-client to 3.0.0 21/99921/4
Gilles Thouenon [Thu, 3 Mar 2022 10:42:12 +0000 (11:42 +0100)]
Bump kafka-client to 3.0.0

https://github.com/apache/kafka/releases/tag/3.0.0

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

2 months agoFix bug in a JUnit nbinotifications test 45/99945/1
Gilles Thouenon [Thu, 3 Mar 2022 10:35:44 +0000 (11:35 +0100)]
Fix bug in a JUnit nbinotifications test

Initialize correctly serializers used by kafka producers.

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

2 months agoRefactor PCE network analyzer PceOtnNode step 7 74/99874/4
guillaume.lambert [Fri, 25 Feb 2022 13:48:09 +0000 (14:48 +0100)]
Refactor PCE network analyzer PceOtnNode step 7

- move & factorize a guard-clause in initXndrTps() method
  to prepare further & deeper rework to decrease cyclomatic complexity
- code refactoring mainly style and intermediate variables removal

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

2 months agoRemove overriding version from lighty pom 76/99876/5
Gilles Thouenon [Fri, 25 Feb 2022 15:39:02 +0000 (16:39 +0100)]
Remove overriding version from lighty pom

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

2 months agoClean up pom.xml files of maven projects 75/99875/5
Gilles Thouenon [Fri, 25 Feb 2022 14:03:33 +0000 (15:03 +0100)]
Clean up pom.xml files of maven projects

- add used but undeclared dependencies to avoid warnings during
compilation
- remove few unused declared dependencies
- add/complement dependencyManagement section when necessary
- clean up xml file format

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

2 months agoRefactor PCE network analyzer PceOtnNode step 6 73/99873/2
guillaume.lambert [Fri, 25 Feb 2022 11:04:19 +0000 (12:04 +0100)]
Refactor PCE network analyzer PceOtnNode step 6

Add 2 new methods to decrease checkSwPool cyclomatic complexity
currently warned by Sonar

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

2 months agoRefactor common JsonStringConverterTest 58/99858/1
guillaume.lambert [Thu, 24 Feb 2022 16:41:10 +0000 (17:41 +0100)]
Refactor common JsonStringConverterTest

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

2 months agoNew API for GNPy 90/99690/8
atriki [Fri, 4 Feb 2022 11:14:01 +0000 (12:14 +0100)]
New API for GNPy

- add new yang files of the api
- update the code
- remove node identification by IP address

JIRA: TRNSPRTPCE-513
Change-Id: I530323561cb3640b7082d4b5e2f22e782b2057b2
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
2 months agoMerge "Keep AvailFreqMaps when netconf session restores"
Guillaume Lambert [Thu, 24 Feb 2022 07:31:11 +0000 (07:31 +0000)]
Merge "Keep AvailFreqMaps when netconf session restores"

3 months agoKeep AvailFreqMaps when netconf session restores 99/99599/3
Jonas Mårtensson [Fri, 4 Feb 2022 10:28:20 +0000 (11:28 +0100)]
Keep AvailFreqMaps when netconf session restores

When the netconf session with a ROADM went down and then it came up
again, the node was re-created in the openroadm topology, resetting the
available frequencies bitmaps for both degrees and SRGs. This meant
that the PCE could allocate already used spectrum for new services,
disrupting existing services.

When creating a new node, first check if it already exists in the
portmapping, and if so, don't initialize available frequencies.

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

3 months agoUpdate portmapping funct tests for otn-mpdr conf 89/99689/2
Gilles Thouenon [Fri, 11 Feb 2022 11:48:48 +0000 (12:48 +0100)]
Update portmapping funct tests for otn-mpdr conf

- add new tests in portmapping functional tests for device 2.2.1 to
  check the OTN device
- add specific tests in portmapping func tests and test_utils to check
  configuration of the odu-switching-pool part
- speed up test execution

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

3 months agoFix odu-switching-pool configuration for OTN mpdr 88/99688/2
Gilles Thouenon [Fri, 11 Feb 2022 11:38:12 +0000 (12:38 +0100)]
Fix odu-switching-pool configuration for OTN mpdr

Replace switching-pool-type "non-blocking" by "blocking" for
otn-muxponder, in honeynode configuration files, to be compliant with
OpenROADM device model white paper, section 3.2.5.2.

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

3 months agoMerge "Add 100G if-OCH-OTU-ODU4 capability"
Balagangadhar Bathula [Tue, 22 Feb 2022 12:17:47 +0000 (12:17 +0000)]
Merge "Add 100G if-OCH-OTU-ODU4 capability"

3 months agoMerge "Change the ODU4 type to ODU-TTP-CTP"
Balagangadhar Bathula [Tue, 22 Feb 2022 12:17:05 +0000 (12:17 +0000)]
Merge "Change the ODU4 type to ODU-TTP-CTP"

3 months agoMerge "Bug in updating 7.1 port-mapping data"
Balagangadhar Bathula [Tue, 22 Feb 2022 12:16:12 +0000 (12:16 +0000)]
Merge "Bug in updating 7.1 port-mapping data"

3 months agoSimplify delete operations 72/99572/6
Balagangadhar Bathula [Thu, 3 Feb 2022 23:42:59 +0000 (18:42 -0500)]
Simplify delete operations

- For all supported versions, simplify delete operations
- Keep the delete operation simple rather than
  passing all the config data into the merge config
  data.

JIRA: TRNSPRTPCE-620
Change-Id: I67514b2073fc91dac36d52a59b6c8d7fb401fd22
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoChange the ODU4 type to ODU-TTP-CTP 03/99803/2
Balagangadhar Bathula [Wed, 16 Feb 2022 21:47:06 +0000 (16:47 -0500)]
Change the ODU4 type to ODU-TTP-CTP

- Currently higher order ODU4 in 2.2.1 device is
  provisioned as ODU type ODU-TTP.
- However for transponders it can be both TTP and CTP.
- Change the class to ODU-TTP-CTP.

JIRA: TRNSPRTPCE-618
Change-Id: I36eab6e361c8ba5728bc866243084b4a4a3698ec
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoAdd 100G if-OCH-OTU-ODU4 capability 04/99804/3
Balagangadhar Bathula [Wed, 16 Feb 2022 21:46:13 +0000 (16:46 -0500)]
Add 100G if-OCH-OTU-ODU4 capability

- 7.1 models 100G transponders advertise the supported
  interface capapbility as if-och-otu-odu4.
- Add code to validate xponder-tp.

JIRA: TRNSPRTPCE-619
Change-Id: Iaae3089014b1d4f0a30508d96e722287a9936651
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoBug in updating 7.1 port-mapping data 01/99801/4
Balagangadhar Bathula [Wed, 16 Feb 2022 21:47:57 +0000 (16:47 -0500)]
Bug in updating 7.1 port-mapping data

- Data for supporting ODUCn and OTUCn is not getting
  updated after service/interface deletion
- Add code to include supporting ODUCn and OTUCn in
  updateMappingInterfaces.

JIRA: TRNSPRTPCE-608

Change-Id: Iffdfc46eff28044d2d48ad94cdc069249507fa69
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoBump upstream dependencies to P-SR2 95/99795/2
Gilles Thouenon [Fri, 18 Feb 2022 09:45:54 +0000 (10:45 +0100)]
Bump upstream dependencies to P-SR2

odlparent => 9.0.13
mdsal => 8.0.11
netconf => 2.0.14

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

3 months agoMerge changes I1be47b25,I0c7b0ba2,Iedfede88,Ida365311
Guillaume Lambert [Tue, 15 Feb 2022 17:19:58 +0000 (17:19 +0000)]
Merge changes I1be47b25,I0c7b0ba2,Iedfede88,Ida365311

* changes:
  Add protection to PCE network analyzer PceOtnNode
  Refactor PCE network analyzer PceOtnNode step 5
  Refactor PCE network analyzer PceOtnNode step 4
  Remove PCE net. analyzer PceOtnNodeTest useless UT

3 months agoMerge "Port-capability support in port-mapping 1.2.1"
Guillaume Lambert [Tue, 15 Feb 2022 15:15:51 +0000 (15:15 +0000)]
Merge "Port-capability support in port-mapping 1.2.1"

3 months agoAdd protection to PCE network analyzer PceOtnNode 39/99739/2
guillaume.lambert [Mon, 14 Feb 2022 16:49:18 +0000 (17:49 +0100)]
Add protection to PCE network analyzer PceOtnNode

SERVICE_TYPE_100GE_T should not occur in PceOtnNode.

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

3 months agoRefactor PCE network analyzer PceOtnNode step 5 20/99720/3
guillaume.lambert [Mon, 14 Feb 2022 10:41:45 +0000 (11:41 +0100)]
Refactor PCE network analyzer PceOtnNode step 5

There is no point to have a different treatment for SERVICE_TYPE_100GE_S
in initXndrTps() to determine the attribute 'valid'.
This specific treatment only affects the argument availableXpdrClientTps
to pass to checkSwPool() when modeType equals "intermediate".
But this parameter is not used in that case.

- refactor and merge checkSwPool() and isAzOrIntermediateAvl() methods
- use checkSwPool() directly in initXndrTps()
- remove SERVICE_TYPE_100GE_S specific treatment

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

3 months agoRefactor PCE network analyzer PceOtnNode step 4 11/99711/4
guillaume.lambert [Mon, 14 Feb 2022 09:23:32 +0000 (10:23 +0100)]
Refactor PCE network analyzer PceOtnNode step 4

SERVICE_TYPE_100GE_T should not occur in PceOtnNode.
- remove it from supported types
- refactor initXndrTps() and isAzOrIntermediateAvl() accordingly

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

3 months agoRemove PCE net. analyzer PceOtnNodeTest useless UT 93/99693/2
guillaume.lambert [Mon, 14 Feb 2022 08:51:29 +0000 (09:51 +0100)]
Remove PCE net. analyzer PceOtnNodeTest useless UT

Some Junit tests in PCE network analyzer PceOtnNodeTest are pointless:
-remove these useless UT

The method isPceOtnNodeValid() in PCE network analyzer PceOtnNode was
only used by these UT. There is no need to keep it now:
- remove this method that has become useless
- remove also the method isOtnServiceTypeValid() since it was only used
  by the method isPceOtnNodeValid() now removed
- merge method isNotValid() into isValid() since apart these methods,
  it was the only other place where it was needed

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

3 months agoRefactor PCE network analyzer PceOtnNode step 3 34/99634/8
guillaume.lambert [Mon, 7 Feb 2022 12:01:30 +0000 (13:01 +0100)]
Refactor PCE network analyzer PceOtnNode step 3

- make class static Maps and Lists final
- rename some variables
- rationalize conditions check & dedicated methods
- use && precendence over || to remove some useless parenthesis
- add a few intermediate functions and variables
- add a few TODO comments on remaining redundant checks code

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

3 months agoRefactor PCE network analyzer PceOtnNode step 2 04/99604/7
guillaume.lambert [Sun, 6 Feb 2022 23:13:27 +0000 (00:13 +0100)]
Refactor PCE network analyzer PceOtnNode step 2

second pass to prepare deeper refactoring of PceOtnNode class:
- use Map or List to check and manage ODU and Eth service types
  instead of switch/case and if condition blocks with multiple checks
- rationalize namespaces use and import
- refactor a few checks and indentations
- point with TODO comments places where
  * some missing service types might be managed
  * some checks are similar to existing methods
  * some new methods would help

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

3 months agoMerge "Getter for port-capability in port-mapping 2.2.1"
Balagangadhar Bathula [Sat, 12 Feb 2022 12:34:02 +0000 (12:34 +0000)]
Merge "Getter for port-capability in port-mapping 2.2.1"

3 months agoMerge "Remove maintenance loopback container"
Balagangadhar Bathula [Fri, 11 Feb 2022 21:13:28 +0000 (21:13 +0000)]
Merge "Remove maintenance loopback container"

3 months agoPort-capability support in port-mapping 1.2.1 92/99692/3
guillaume.lambert [Fri, 11 Feb 2022 13:43:54 +0000 (14:43 +0100)]
Port-capability support in port-mapping 1.2.1

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

3 months agoBug in interface delete 400G-Ethernet 75/99675/3
Balagangadhar Bathula [Thu, 10 Feb 2022 07:13:10 +0000 (02:13 -0500)]
Bug in interface delete 400G-Ethernet

Fix the order of deletion for 400G Ethernet service
ODUFlex, ODUC4

JIRA: TRNSPRTPCE-614

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

3 months agoGetter for port-capability in port-mapping 2.2.1 65/99665/3
Balagangadhar Bathula [Tue, 8 Feb 2022 18:58:03 +0000 (13:58 -0500)]
Getter for port-capability in port-mapping 2.2.1

- There are two ways the 2.2.1 device can advertise
  supported port-capabilities
  a. Using the leaf list supported-interface-capability
     under ports list
  b. Using port-capabilities tree.
- Currently port-mapping only supports case (a).
- Add code to provide support for case (b).

JIRA: TRNSPRTPCE-610
Change-Id: I2e6900ccafa3e50d44d59d55c97acf824c28639e
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoRemove maintenance loopback container 74/99674/2
Balagangadhar Bathula [Wed, 9 Feb 2022 21:16:52 +0000 (16:16 -0500)]
Remove maintenance loopback container

- Even with maintenance loopback set false,
  NE could reject the interface creation
- Completely remove the container during the renderer
  interface creation

JIRA: TRNSPRTPCE-613
Change-Id: Ibe6fc52e7b074d5d593bad3a34638d3ba83e2990
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoDistinguish available SRG for uni/bi-direction 91/96191/7
Vachhani, Shweta (sv111y) [Fri, 14 May 2021 18:05:27 +0000 (14:05 -0400)]
Distinguish available SRG for uni/bi-direction

- Currently CP-type is assigned TXRX irrespective of unidirectional
  or bidirectional. Since CP-type is used to assign respective SRG-type,
  it could be misleading.
- Fix the code to have correct SRG-type.

JIRA: TRNSPRTPCE-445
Signed-off-by: Vachhani, Shweta (sv111y) <sv111y@att.com>
Change-Id: Ia0b5e82e2182d6445238e8df0a540683ad2ade7c

3 months agoFix bug in PCE picking wrong client port 59/99459/16
Gilles Thouenon [Wed, 26 Jan 2022 08:14:05 +0000 (09:14 +0100)]
Fix bug in PCE picking wrong client port

- Instead of systematically picking the first available client port
compatible with the service, pick the client port provided by the input
request parameters when specified.
- Update existing node validation to pick only endpoints with tail
- Fix a bug in otn intermediate switch functional test suite.
- Remove from tapi-connectivity impl few lines of strange code that
seems being wrong since it was replacing the client port-name specified
in the request by its associated network port-name, what was making
Ethernet service creation failing.

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

3 months agoMerge "Update 7.1 port-mapping data after inf delete"
Balagangadhar Bathula [Thu, 10 Feb 2022 12:56:24 +0000 (12:56 +0000)]
Merge "Update 7.1 port-mapping data after inf delete"

3 months agoUpdate power target mask for mixed line-rate 97/99497/7
Balagangadhar Bathula [Wed, 26 Jan 2022 14:07:00 +0000 (09:07 -0500)]
Update power target mask for mixed line-rate

Update power (P1 [50GHz]) for 400/100G mixed line,
according to the openROADM Optical Specifications v5.0

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

3 months agoMerge changes Iee0b74c7,Ibe1f0b89,I1140eec7
Guillaume Lambert [Tue, 8 Feb 2022 17:02:53 +0000 (17:02 +0000)]
Merge changes Iee0b74c7,Ibe1f0b89,I1140eec7

* changes:
  Make OpenRoadmOtnTopology class static Maps final
  Improve networkmodel util OpenRoadmOtnTopology 2/2
  Improve networkmodel util OpenRoadmOtnTopology 1/2

3 months agoUpdate 7.1 port-mapping data after inf delete 35/99635/3
Balagangadhar Bathula [Mon, 7 Feb 2022 16:26:07 +0000 (11:26 -0500)]
Update 7.1 port-mapping data after inf delete

- When the service/interface is deleted, the 7.1
  port-mapping data is not updated and still shows the
  supporting ODUCn/OTUCn interfaces.
- Add code to update data for the supporting
  interfaces, after deletion.

JIRA: TRNSPRTPCE-608
Change-Id: Ie0af185285f645c2d52d88699ba538bdf207a66b
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
3 months agoDo not instantiate JsonParser 45/99645/1
Robert Varga [Tue, 8 Feb 2022 09:41:14 +0000 (10:41 +0100)]
Do not instantiate JsonParser

Use the parseString() instead of deprecated methods.

Change-Id: I37a5cd99f0ab40c6948b4301adc140262d0b9f80
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
3 months agoMake OpenRoadmOtnTopology class static Maps final 38/99638/2
guillaume.lambert [Mon, 7 Feb 2022 20:58:17 +0000 (21:58 +0100)]
Make OpenRoadmOtnTopology class static Maps final

JIRA: TRNSPRTPCE-597 TRNSPRTPCE-526
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iee0b74c7ddebf861291cbea986b3288108b68109

3 months agoImprove networkmodel util OpenRoadmOtnTopology 2/2 00/99600/2
guillaume.lambert [Fri, 4 Feb 2022 11:30:50 +0000 (12:30 +0100)]
Improve networkmodel util OpenRoadmOtnTopology 2/2

- use class Map for Service Rate / ODU type Identification
- use Long type and < or > rather than equals for bandwidth comparison
- rationalize addAugmentation and builder use

JIRA: TRNSPRTPCE-597 TRNSPRTPCE-526
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe1f0b89d63f72953e392a9cb2dffcec47c21af8