transportpce.git
2 years agoUpdate INFO.yaml IRC chat locations 79/96479/1 stable/aluminium
guillaume.lambert [Wed, 16 Jun 2021 10:27:05 +0000 (12:27 +0200)]
Update INFO.yaml IRC chat locations

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

2 years agoIgnore JsonStringConverter unchecked cast warning 18/96518/2
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 agoUse maven batch and quiet modes inside tox 17/96517/2
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

2 years agoFix function test PCE 400G return code 16/96516/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
(cherry picked from commit 156b223e2ff116bea5834fc376090eac0ea1e75d)

2 years agoMake honeynode install script more robust 15/96515/2
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

2 years agoIncrease sims startup timeout in functional tests 14/96514/2
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

2 years agoIncrease controller startup timeout in func tests 13/96513/2
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

2 years agoRemove a useless dependency in PCE 12/96512/2
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

2 years agoImprove otnrenderer functional test 11/96511/2
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

2 years agoImprove debug tools install 10/96510/1
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

2 years agoBump upstream dependencies to Aluminium SR4 08/96508/1
Gilles Thouenon [Thu, 10 Jun 2021 07:54:11 +0000 (09:54 +0200)]
Bump upstream dependencies to Aluminium SR4

- odlparent => 7.0.10
- mdsal => 6.0.10

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

3 years agoDecrease docs tox profiles logs verbosity 16/95816/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 agoFunctional test for pce 400G 75/95475/6
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 agoAdapt PCE to compute a 400GE path 66/95466/6
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 agofix issue in Lighty for PortMapping 24/95624/2
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

3 years agoFix bug in portmapping 74/95474/1
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
(cherry picked from commit e38168def8a2fe710c6eb37cfe2f6bab7c9b0f4a)

3 years agoDevice Renderer to support transponder for B100G 50/95350/13
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 agoUpdated OLM module to support 7.1 devices 21/95421/3
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 agoBump netconf upstreams dep to 1.9.4-SNAPSHOT 14/95514/1
guillaume.lambert [Wed, 17 Mar 2021 10:00:44 +0000 (11:00 +0100)]
Bump netconf upstreams dep to 1.9.4-SNAPSHOT

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

3 years agoBump project version to Al SR4 13/95513/1
guillaume.lambert [Wed, 17 Mar 2021 09:51:52 +0000 (10:51 +0100)]
Bump project version to Al SR4

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

3 years agoMerge "Manage 400G in portmapping and topologies" into stable/aluminium
Guillaume Lambert [Mon, 15 Mar 2021 09:13:58 +0000 (09:13 +0000)]
Merge "Manage 400G in portmapping and topologies" into stable/aluminium

3 years agoMerge "Upgrade honeynode 2.2.1 simulator version" into stable/aluminium
Guillaume Lambert [Mon, 15 Mar 2021 09:13:27 +0000 (09:13 +0000)]
Merge "Upgrade honeynode 2.2.1 simulator version" into stable/aluminium

3 years agoMerge changes I3398199c,I32acb272 into stable/aluminium
Guillaume Lambert [Mon, 15 Mar 2021 09:12:56 +0000 (09:12 +0000)]
Merge changes I3398199c,I32acb272 into stable/aluminium

* changes:
  Fix maven detection in tox.ini
  Add a checkbashisms tox profile

3 years agoFix maven detection in tox.ini 72/95472/1
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
(cherry picked from commit 2daa093d70cd42b92a52d890f53a71349c027f3e)

3 years agoFix some scripts shebang 68/95468/1
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
(cherry picked from commit d4bef7fe45bda62b6995c2e4c0d69d2f6b03f022)

3 years agoAdd a checkbashisms tox profile 67/95467/1
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
(cherry picked from commit 9c5d4ceb7a917b937cb281e12a94c1663fb57bb4)

3 years agoManage 400G in portmapping and topologies 05/95005/1
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
(cherry picked from commit 8fa7e1e25b411f111f198152af6e6244727e71a9)

3 years agoUpgrade honeynode 2.2.1 simulator version 04/95004/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
(cherry picked from commit 28f85f22c6fe1847a03de7bfdd954fb3ba00eb7d)

3 years agoSmall improvement in PceGraph 98/94998/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
(cherry picked from commit d989ec9ba6df915c0721281ba4dddc1d199385bc)

3 years agoImprove honeynode installation process in tox 97/94997/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
(cherry picked from commit 8d504952b63f54ad2390f5d6917eed995ee1b8f2)

3 years agoHoneynode for 7.1 devices 96/94996/1
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
(cherry picked from commit fc468b23a197bd55e46b8b4add1388ff4f6a90e7)

3 years agoFix grep feature name in test_utils.py 95/94995/1
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
(cherry picked from commit 4a3e94824b3d608fa3b21eee21f5dae220dc41fd)

3 years agoMerge changes I28cba22c,I7f0d4601,I8df37176 into stable/aluminium
Guillaume Lambert [Tue, 23 Feb 2021 15:49:57 +0000 (15:49 +0000)]
Merge changes I28cba22c,I7f0d4601,I8df37176 into stable/aluminium

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

3 years agoAdd protection on Xponder-in/out link creation 21/95321/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
(cherry picked from commit d48474417b7498e4b1ca09dc61fa008cdd9ca95a)

3 years agoGNPy client refactor 14/95314/2
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 13/95313/2
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 12/95312/2
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 agodisable PMD/CPD checks in 2 portmapping classes 19/95319/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 18/95318/2
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 agoFix usage of deprecated method in portmapping 17/95317/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

3 years agoFix+align portmapping protections and log messages 16/95316/2
guillaume.lambert [Thu, 28 Jan 2021 22:57:33 +0000 (23:57 +0100)]
Fix+align portmapping protections and log messages

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

3 years agoAdd a portmapping method to retrieve Xpdr port2 15/95315/2
guillaume.lambert [Thu, 28 Jan 2021 20:16:10 +0000 (21:16 +0100)]
Add a portmapping method to retrieve Xpdr port2

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

3 years agoSet mandatory UUID in TAPI connectivity module 87/94987/4
Gilles Thouenon [Fri, 22 Jan 2021 11:02:07 +0000 (12:02 +0100)]
Set mandatory UUID in TAPI connectivity module

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

3 years agoFix the SIP uuid generation in TAPI topology 86/94986/5
Gilles Thouenon [Fri, 22 Jan 2021 09:54:41 +0000 (10:54 +0100)]
Fix the SIP uuid generation in TAPI topology

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

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

3 years agoBump dependencies and project version to Al SR3 26/95226/3
Gilles Thouenon [Thu, 18 Feb 2021 14:55:24 +0000 (15:55 +0100)]
Bump dependencies and project version to Al SR3

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

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

3 years agoMerge "Change maven download link" into stable/aluminium
Guillaume Lambert [Tue, 9 Feb 2021 09:11:05 +0000 (09:11 +0000)]
Merge "Change maven download link" into stable/aluminium

3 years agoMerge "Fix variable name in tapi-topology" into stable/aluminium
Guillaume Lambert [Tue, 9 Feb 2021 09:10:49 +0000 (09:10 +0000)]
Merge "Fix variable name in tapi-topology" into stable/aluminium

3 years agoFix variable name in tapi-topology 94/94994/1
Gilles Thouenon [Mon, 1 Feb 2021 16:39:16 +0000 (17:39 +0100)]
Fix variable name in tapi-topology

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

3 years agoChange maven download link 93/94993/1
manuedelf [Wed, 3 Feb 2021 22:22:36 +0000 (23:22 +0100)]
Change maven download link

The previous seems down

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

3 years agoAdd a portmapping putXpdrLcpsInMaps method 92/94992/1
guillaume.lambert [Thu, 28 Jan 2021 13:53:54 +0000 (14:53 +0100)]
Add a portmapping putXpdrLcpsInMaps method

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

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

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

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

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

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

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

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

3 years agoFix resource deletion issue in openroadm-topology 27/94427/1
Gilles Thouenon [Fri, 15 Jan 2021 10:56:02 +0000 (11:56 +0100)]
Fix resource deletion issue in openroadm-topology

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

3 years agobump lighty build to 13.1.0 11/94611/1
guillaume.lambert [Tue, 12 Jan 2021 08:35:56 +0000 (09:35 +0100)]
bump lighty build to 13.1.0

and fix some checkstyle warnings

NB:
lighty-core controller 13.1.0 is available on ODL nexus since 11/01/2021
https://nexus.opendaylight.org/content/repositories/public/io/lighty/core/lighty-controller/

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

3 years agoBump uptream dependencies to Al SR2 10/94610/1
Gilles Thouenon [Tue, 12 Jan 2021 07:59:35 +0000 (08:59 +0100)]
Bump uptream dependencies to Al SR2

- odlparent: 7.0.8
- mdsal: 6.0.8

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

3 years agoUpdate PCE-GNPy for flexgrid 95/94295/3
manuedelf [Mon, 21 Dec 2020 17:58:05 +0000 (18:58 +0100)]
Update PCE-GNPy for flexgrid

Remove use of wavelength to createPathConstraints in GnpyServiceImpl.
Add new method in GridUtils to get N value from frequency index.
Add new map in GridConstant to get spectral width slot number from rate.

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

3 years agoRefactor to remove useless wavelength reference 93/94293/5
manuedelf [Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)]
Refactor to remove useless wavelength reference

As now we are using frequencies and all information about allocated
frequencies are provided by pce, refactor code to remove useless
wavelength references.
- in order to avoid too much parameters in methods from renderer and
common, add a new class SpectrumInformation which contains width, min
freq, max freq, wavelength number (for 1.2.1), center freq, lower
spectral slot number, higher spectral slot number. This class also
contains a method to generate connection name and lcp name from
parameters
- update constructors of crossconnect and openroadminterface by
replacing parameters like width center freq, lower and higher spectral
slot number with SpectrumInformation parameter
- remove duplicated method
- remove FixedFlex and Flexgrid as they are no more needed.
- rename GRID_FREQUENCY_PRECISION to FIXED_GRID_FREQUENCY_PRECISION and
add FLEX_GRID_FREQUENCY_PRECISION as precision is not the same for fixed
and flex grid
- add initSpectrumInformationFromServicePathInput in GridUtils to
instanciate SpectrumInformation object from ServicePathInput
- update blueprint files
- update unit tests to pass the compilation (no refactoring done here to
improve unit tests)
- update test_flexgrid, set wavelength number to 0 (as we are in
flexgrid mode) and slot number to be coherent with frequencies

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

3 years agoUpdate connection and interface name 92/94292/4
manuedelf [Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)]
Update connection and interface name

As now we allocate frequencies instead of wavelength, change connection
and interface format name by replacing wavelength reference by lower
spectral slot number and higher spectral slot number.
For example: SRG1-PP1-TXRX-DEG1-TTP-TXRX-1 becomes
SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768
XPDR1-NETWORK1-1 becomes XPDR1-NETWORK1-761:768
- add lower and higher spectral slot number in signature methods of
crossconnect, olm, ModelMappinUtils, openroadminterface,
openroadmfactory
- add some log info
- update ServicePathInput and ServicePowerSetup in MappingUtils with
frequencies, spectral slot number and modulation format
- add new map to get slot width from service rate and modulation format
in GridConstant
- add methods in GridUtils to get lower and higher spectal slot number
from frequency
- update unit tests to take into account the new format name
- update functional tests to take into account the new format name

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

3 years agoUse slot width granularity in PCE 67/94267/5
manuedelf [Fri, 18 Dec 2020 07:26:27 +0000 (08:26 +0100)]
Use slot width granularity in PCE

Adding a new constraint in spectrum assignment for path calculation:
slot width granularity from mc capabilities. If for node, slot width
granularity is equals to 50GHz then spectrum assignment will be done
in fixed mode.
- Add new method to PceNode interface and its implementation to get
 slot width granularity.
- Add new method to MappingUtils to get mc capabilities for a node.
- Update unit tests

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

3 years agoAdd methods to GridUtils 42/94242/9
manuedelf [Tue, 15 Dec 2020 07:17:39 +0000 (08:17 +0100)]
Add methods to GridUtils

Add getCentralFrequencyWithPrecision and computeCentralFrequency.

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

3 years agoNew version of transportpce common types 40/94240/9
manuedelf [Mon, 14 Dec 2020 09:55:05 +0000 (10:55 +0100)]
New version of transportpce common types

- Update grouping olm-renderer-input, adding min, max frequencies
 lower spectral slot number and higher spectral slot number
- Update group olm-renderer-input, replacing slot-width with width
- Fix center-freq unit
- Update import in common, lighty, olm and renderer module
- Update setPower in PowerMgmtImpl as now we use width instead of
 slot-width
- Update variable name in method signature in OpenRoadmfactory,
 OpenRoadmInterface221 and DeviceRendererServiceImpl as now se use
 width instead of slot-width
- Update createMCInterface and createNMCInterface as now we use width
 instead of slot-width
- Update functional test test_flexgrid to be compliant with use of width
 instead of slot-width

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

3 years agoNetworkmodel class renaming 39/94239/8
manuedelf [Fri, 11 Dec 2020 15:33:57 +0000 (16:33 +0100)]
Networkmodel class renaming

Rename NetworkModelWavelengthService, NetworkModelWavelengthServiceImpl
and NetworkModelWavelengthServiceTest to FrequenciesService,
FrequenciesServiceImpl and FrequenciesServiceTest as now we manage
frequencies. Update reference in blueprint file and classes using one of
those classes.

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

3 years agoNetwork model add enable wavelength unit test 38/94238/8
manuedelf [Fri, 11 Dec 2020 15:21:45 +0000 (16:21 +0100)]
Network model add enable wavelength unit test

- Enable and fix NetworkModelWavelengthServiceTest.
- Remove no more used PathDescriptionUtils test class
- Add a stub yang model for path-description in test-common to define
path description as a container and use it to parse
path_description.json test file. Using a json file avoid to have big
test classes to instantiate yang object.

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

3 years agoTest-common module update 37/94237/8
manuedelf [Fri, 11 Dec 2020 15:04:34 +0000 (16:04 +0100)]
Test-common module update

Update test-common module to be able to deserialize json for yang object
that are not data object (notification, rpcdata).
- change parent to mdsal bing parent to be able to generate classes from
yang files : today converter can only parse json for data object not
notification or rpcdata. A temporary workaroud is to add stub model yang
data object.
- replace getBindingToNormalizedNodeCodec by getBindingDOMCodecServices
to have all the methods of BindingDOMCodecServices.
TODO: clean converter to use methods from BindingDOMCodecServices
and focus converter on parsing/writing json or xml file for data
object, notification or rpcdata.

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

3 years agoFlexgrid for pce and network model 36/94236/8
manuedelf [Tue, 8 Dec 2020 17:41:21 +0000 (18:41 +0100)]
Flexgrid for pce and network model

- add ServiceRateConstant class in common module to centralize service
rate Uint32 format.
- update GridConstant with maps (service type and nb slots, service rate
and modulation format, service rate-modulation format and frequency
width) and constant for irrelevant wavelength number.
- add methods in GridUtils.
- rename methods in NetworkModelWaveLengthService to be compliant with
frequencies.
- disable NetworkModelWaveLengthService unit tests.
- move some methods from NetworkModelWaveLengthServiceImpl to
OpenRoadmTopology util class in network model.
- update pce with flexgrid spectrum assignment computation.
- update pce unit tests.
- add getBitSetData method to PceNode and remove checkWL method.
- update PceNode implementations (PceOtnNode and PceOpticalNode).
- rename methods in pce to be compliant with frequencies.
- update some log messages to be coherent with frequencies.
- add minFrequency and maxFrequency to PceResult.
- update functional tests.
- update topology test files set freq map value to have the smallest
lambda on the higher index of the freqmap.

About "disable NetworkModelWaveLengthService unit tests":
some updates are needed in test-common: path-description is a
grouping and is used only in notification. DataObjectConverter converts
only data so to be able to Deserialize path-description from json file
in unit tests, a solution could be to add a dummy yang model in
test-common with container using path-description.

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

3 years agoMove TopologyDataUtils from tapi to test-common 35/94235/7
manuedelf [Thu, 10 Dec 2020 14:46:35 +0000 (15:46 +0100)]
Move TopologyDataUtils from tapi to test-common

Move TopologyDataUtils test class from tapi to test-common in order to
be able to reuse it in other maven modules. As this class is now in
src/main/java, fix spotbugs issues.

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

3 years agoConstants for service type 34/94234/7
manuedelf [Wed, 2 Dec 2020 10:27:45 +0000 (11:27 +0100)]
Constants for service type

- add service type constants in common/StringConstant
- update classes with those new constants
- add Map in GridConstant to get spectral width slot number from
service type

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

3 years agoFrequency computation 33/94233/6
manuedelf [Tue, 1 Dec 2020 19:52:33 +0000 (20:52 +0100)]
Frequency computation

- Update GridUtils with 2 methods for computing wavelength number and
frequency.
- Add unit tests for those methods
- Add nb slots constants for 100G and 400G
- Add constant for central frequency

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

3 years agoPCE modification in order to prepare flexgrid 32/94232/6
manuedelf [Tue, 1 Dec 2020 07:46:23 +0000 (08:46 +0100)]
PCE modification in order to prepare flexgrid

- add version to PCeNode because spectrum assignment will depend on
node version
- add SpectrumAssignement class for result of spectrum assignment
- update functional pce and gnpy functional tests to manage version
through portmapping

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

3 years agoNew version of transportpce-pathDescription 31/94231/6
manuedelf [Mon, 30 Nov 2020 15:23:02 +0000 (16:23 +0100)]
New version of transportpce-pathDescription

- add aToZ-min-frequency and aToZ-max-frequency to aToZ-direction to
support flexgrid
- add ZToa-min-frequency and ZToa-max-frequency to zToA-direction to
support flexgrid
- update import of pathdescription in pce, renderer, servicehandler and
lighty

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

3 years agoUpdate naming following flexgrid specification 30/94230/6
manuedelf [Mon, 30 Nov 2020 12:39:47 +0000 (13:39 +0100)]
Update naming following flexgrid specification

- set EFFECTIVE_BITS_VALUE to 768
- update data file samples, unit tests and functional tests
with this new value
- rename NB_CHANNELS to NB_OCTECTS as it's relevant in flexgrid
- remove FixedFridConstant as there is no more specific value

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

3 years agoAdd getDataBroker to NetworkTransactionService 29/94229/6
manuedelf [Mon, 30 Nov 2020 09:02:17 +0000 (10:02 +0100)]
Add getDataBroker to NetworkTransactionService

In order to prepare flexgrid add getDataBroker method to be able to
retrieve version of PceOpticalNode.

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

3 years agoLight refactor on PceOpticalNode 28/94228/6
manuedelf [Wed, 25 Nov 2020 19:28:15 +0000 (20:28 +0100)]
Light refactor on PceOpticalNode

- remove useless class attributes
- simplify case SRGTXRXPP in initSrgTps method

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

3 years agoMinimal refactor of renderer to prepare flexgrid 27/94227/6
manuedelf [Thu, 3 Dec 2020 18:07:08 +0000 (19:07 +0100)]
Minimal refactor of renderer to prepare flexgrid

- Move NetworkModelWavelengthService to networkmodel as topology update
  must be done by this module.
- NetworkModelWavelengthService is now invoked by a notification sent
  by service handler instead of being directly called by renderer
- Update constructors when NetworkModelWavelengthService is no more
  used.
- Remove no more used methods from RenderServiceOperations and its
  implementation.
- Update RenderListenerImpl from service handler to send notification
  for network model.
- Add a service listener to networkmodel to update frequencies map in
  topology.
- Minimal update to unit test after moving class
- Move MountPointStub from renderer to test-common
- Update blueprint files of render, service handler and network model

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

3 years agoMove NodeIdPair from renderer to common 26/94226/3
manuedelf [Thu, 3 Dec 2020 17:01:21 +0000 (18:01 +0100)]
Move NodeIdPair from renderer to common

In order to prepare light refactor on renderer, move NodeIdPair class
to common module.
Update import in class using this class.

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

3 years agoNew version of transportpce-servicehandler yang 25/94225/3
manuedelf [Thu, 3 Dec 2020 13:15:30 +0000 (14:15 +0100)]
New version of transportpce-servicehandler yang

- add path-description container in service-rpc-result-sh to prepare
renderer light refactor (move NetworkModelWavelengthService and its
implementation from renderer module to networkmodel module)
- update import in servicehandler module
- update import in lighty module

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

3 years agoNew version of yang transportpce-renderer 24/94224/3
manuedelf [Thu, 3 Dec 2020 20:55:43 +0000 (21:55 +0100)]
New version of yang transportpce-renderer

- rename notification service-rpc-result-sp to
  notification renderer-rpc-result-sp
- add path description container to notification
- update import and class name in renderer, service handler and
  lighty

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

3 years agooutsource flexgrid constants import in functests 40/94040/1
guillaume.lambert [Tue, 15 Dec 2020 16:48:03 +0000 (17:48 +0100)]
outsource flexgrid constants import in functests

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

3 years agoclean renderer NetworkModelWavelengthServiceImpl 39/94039/1
guillaume.lambert [Tue, 15 Dec 2020 16:28:41 +0000 (17:28 +0100)]
clean renderer NetworkModelWavelengthServiceImpl

- fix a few indentations
- optimize a few guard clauses
- use ternary operator for some trivial assignments

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

3 years agosplit checkPartnerPort method in PortMapping 38/94038/1
guillaume.lambert [Tue, 15 Dec 2020 14:54:04 +0000 (15:54 +0100)]
split checkPartnerPort method in PortMapping

this allows to reuse the intermediate checks in several other places
and to remove useless checks and to add protections.

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

3 years agoremove some useless null checks from portmapping 37/94037/1
Gilles Thouenon [Tue, 15 Dec 2020 13:52:34 +0000 (14:52 +0100)]
remove some useless null checks from portmapping

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

3 years agoimprove partner-port check in createTtpPortMapping 36/94036/1
guillaume.lambert [Fri, 4 Dec 2020 21:10:19 +0000 (22:10 +0100)]
improve partner-port check in createTtpPortMapping

use the checkPartnerPort method inside createTtpPortMapping
such as done in createXpdrPortMapping or createPpPortMapping.

Beyond the overall coherency, this allows to perform some additional
(and maybe missing) null checking before accessing the related fields
and it also improves the log messages details.

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

3 years agoAlign and improve Portmapping versions Step 2 35/94035/1
guillaume.lambert [Thu, 26 Nov 2020 14:34:36 +0000 (15:34 +0100)]
Align and improve Portmapping versions Step 2

- optimize some pieces of code, mainly by improving checks orders,
  and sometimes by reversing the logic too.
- gather preliminary checks and use "continue" in loop rather than
  else-if-blocks to ease indentation and optimizations
- use (YANG) enums and switch/case rather than (else-)if-blocks
- add some new protections
- get rid of @SuppressWarnings linelength checks
- points with TODO comments potential code mutualizations or alignments
- introduce checkPartnerPort function in Portmapping 1.2.1

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

3 years agouse ternary operators in portmapping 33/94033/1
guillaume.lambert [Fri, 27 Nov 2020 20:06:18 +0000 (21:06 +0100)]
use ternary operators in portmapping

use ternary operators for conditional assignments
rather than if-else-blocks

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

3 years agomake honeynode download quieter 32/94032/1
guillaume.lambert [Fri, 4 Dec 2020 19:31:51 +0000 (20:31 +0100)]
make honeynode download quieter

and reduce logs size

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

3 years agomake honeynode and lighty builds unzip quieter 31/94031/1
guillaume.lambert [Fri, 4 Dec 2020 09:42:57 +0000 (10:42 +0100)]
make honeynode and lighty builds unzip quieter

and reduce logs size

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

3 years agoUpdate OTN E2E functional tests for 1GE 81/93981/7
Christophe Betoule [Mon, 30 Nov 2020 10:25:40 +0000 (11:25 +0100)]
Update OTN E2E functional tests for 1GE

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

3 years agoPort capabilities handling in OTN topology 80/93980/7
Christophe Betoule [Wed, 25 Nov 2020 15:08:31 +0000 (16:08 +0100)]
Port capabilities handling in OTN topology

- replace hardcoded capabilities of a termination point by the ones
coming from device port (via portmapping)
- adapt pce consequently
- adapt functional tests consequently
- adapt UT consequently

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

3 years agoUpdate OTN configuration files for honeynode 79/93979/7
Christophe Betoule [Wed, 4 Nov 2020 11:26:42 +0000 (12:26 +0100)]
Update OTN configuration files for honeynode

- add a third xponder with a mux composed of 4 1GE
client ports and 1 100Gbps network port for otn
emulated nodes
- adapt functional tests consequently

Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Olivier Renais <olivier.renais@orange.com>
Change-Id: Ic978f2e67bfada13220c091a685747ce55616be1

3 years agoFix issue in PCE 78/93978/7
Christophe Betoule [Wed, 25 Nov 2020 15:06:58 +0000 (16:06 +0100)]
Fix issue in PCE

- manage the case when openroadm-topology contains multiple XPDR nodes
with the same supporting node-ref in openroadm-network
- update network topology for PCE func tests by adding tp-type for SGR
in complex openroadm-topology

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

3 years agoUpdate Honeynode simulator version 70/94070/1
manuedelf [Wed, 25 Nov 2020 19:36:12 +0000 (20:36 +0100)]
Update Honeynode simulator version

Following java version regexp fix in honeycomb-tpce.

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

3 years agoUpgrade to OpenROADM 7.1.0 network models 69/94069/1
manuedelf [Wed, 4 Nov 2020 08:10:37 +0000 (09:10 +0100)]
Upgrade to OpenROADM 7.1.0 network models

- Replace existing OpenROADM network models with version 7.1.0
- New version of transportpce-topology model to suppport 7.1.0 models
- common module: add constants to manage fixed and flex grid,
  add GridUtils class to init frequencies map
- update networkmodel module: update import version, update unit tests
- update renderer module: update import version, replace wavelength
  with frequencies map, update unit tests
- update olm module: update import version
- update pce module: update import version, replace wavelength with
  frequencies map (from 7.1 models), update unit tests and data test
  files
- update tapi module: update import version and data test file
- update lighty module: update import version
- update functional tests: update response check, add constants and
  functions to compute freq map, update data test files

Note that in pce, tapi modules and functional tests, there is
a major update in test data files: replacement of
available-wavelength
with avail-freq-maps which contains a base64 encoded 96 bytes
representing available frequency

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

3 years agoadd a documentation spellchecker tox profile 26/93826/3
guillaume.lambert [Fri, 13 Nov 2020 10:47:48 +0000 (11:47 +0100)]
add a documentation spellchecker tox profile

inspired from openStack
https://github.com/openstack/qa-specs/blob/master/tox.ini

https://doughellmann.com/blog/tag/sphinxcontrib-spelling/
https://pypi.org/project/sphinxcontrib-spelling/

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

3 years agoOrdmodels - Remove generated code from source control 68/94068/1
manuedelf [Thu, 12 Nov 2020 15:44:13 +0000 (16:44 +0100)]
Ordmodels - Remove generated code from source control

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

3 years agoreformat api YANG models with pyang 67/94067/1
guillaume.lambert [Fri, 13 Nov 2020 10:09:49 +0000 (11:09 +0100)]
reformat api YANG models with pyang

using pyang 2.4.0 via pyangformat tox profile

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

3 years agoadd pyang tox profiles to check/format api models 66/94066/1
guillaume.lambert [Thu, 12 Nov 2020 13:46:39 +0000 (14:46 +0100)]
add pyang tox profiles to check/format api models

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

3 years agofix DM_CONVERT_CASE SpotBugs issues in portmapping 65/94065/1
guillaume.lambert [Thu, 26 Nov 2020 14:26:42 +0000 (15:26 +0100)]
fix DM_CONVERT_CASE SpotBugs issues in portmapping

and get rid of the related @SuppressFBWarning
by using the default Locale with toUpperCase methods

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

3 years agoexplicit a cast in portmapping Version 2.2.1 64/94064/1
guillaume.lambert [Thu, 26 Nov 2020 14:17:20 +0000 (15:17 +0100)]
explicit a cast in portmapping Version 2.2.1

by ignoring an unchecked conversion warning

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

3 years agoAdd protection in portmapping connection-map loop 63/94063/1
Balagangadhar Bathula [Wed, 11 Nov 2020 20:02:06 +0000 (15:02 -0500)]
Add protection in portmapping connection-map loop

the port-mapping fails if the xponder subtree is absent
for the entries in connection-map.
This can happen with some devices buggy implementations.

JIRA: TRNSPRTPCE-348
Change-Id: If1a0cb15f8e55038485d75cbe9cdcd826d70c06b