transportpce.git
16 months agoTurn NetworkUtilsImpl into a Component 89/108389/2
Gilles Thouenon [Wed, 27 Sep 2023 15:34:37 +0000 (17:34 +0200)]
Turn NetworkUtilsImpl into a Component

Instead of instanciating this implementation from NetworkModelProvider,
convert it into a simple component.

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

16 months agoFix some typos in functional tests naming 88/108388/2
guillaume.lambert [Tue, 12 Sep 2023 14:41:05 +0000 (16:41 +0200)]
Fix some typos in functional tests naming

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

16 months agoFix some compilation warnings 87/108387/2
guillaume.lambert [Tue, 5 Sep 2023 08:38:06 +0000 (10:38 +0200)]
Fix some compilation warnings

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

16 months agoClean some functional tests comments & logs 86/108386/2
guillaume.lambert [Tue, 5 Sep 2023 10:01:22 +0000 (12:01 +0200)]
Clean some functional tests comments & logs

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

16 months agoRefactor tox.ini 85/108385/2
guillaume.lambert [Fri, 1 Sep 2023 10:48:48 +0000 (12:48 +0200)]
Refactor tox.ini

- use one variable per line for tox3 support

One variable is the only syntax supported by both tox3 and tox4.

https: //tox.wiki/en/4.0.3/faq.html#tox-4-changed-ini-rules
https://github.com/tox-dev/tox/issues/2658

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

16 months agoDeclare SuppressFBWarnings in imports 84/108384/2
Gilles Thouenon [Tue, 29 Aug 2023 14:18:40 +0000 (16:18 +0200)]
Declare SuppressFBWarnings in imports

Improve code readability

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

16 months agoMigrate nullness annotations 83/108383/2
Robert Varga [Wed, 5 Jul 2023 21:40:19 +0000 (23:40 +0200)]
Migrate nullness annotations

Do not depend on javax.annotation, use JDT annotations instead.

Change-Id: Ie0e30b6ab0e1f7314f55aa40a0a667f6d7739ae7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
16 months agoBump upstream dependencies to Ar-SR3 70/108370/7
Gilles Thouenon [Thu, 12 Oct 2023 07:25:48 +0000 (09:25 +0200)]
Bump upstream dependencies to Ar-SR3

Adopt:
- odlparent-12.0.8
- yangtools-10.0.10
- mdsal-11.0.13
- netconf-5.0.8
- lighty-18.2.0
- transportpce-models-18.3.0

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

16 months agofix inventory module configuration file 77/108377/7
Gilles Thouenon [Thu, 12 Oct 2023 16:19:28 +0000 (18:19 +0200)]
fix inventory module configuration file

With MariaDb driver 3.1.4 available in karaf-4.4.4, the databaseName
parameter has been removed from the DataSourceFactory.
Remove it from the inventory configuration file.

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

16 months agoFixup checkstyle violations 69/108369/4
Gilles Thouenon [Thu, 12 Oct 2023 09:35:46 +0000 (11:35 +0200)]
Fixup checkstyle violations

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

16 months agoFix new pylint-3.0.0 detected issues 78/108378/1
Gilles Thouenon [Tue, 3 Oct 2023 07:35:06 +0000 (09:35 +0200)]
Fix new pylint-3.0.0 detected issues

Refactor wait_until_log_contains method of test_utils taking advantage
of the with block in order to remove the finally block. That simplifies
the return flow.

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

17 months agoBump project version 86/107986/1
Gilles Thouenon [Tue, 26 Sep 2023 07:23:51 +0000 (09:23 +0200)]
Bump project version

Start next development iteration

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

18 months agoRelease transportpce 7.2.0
jenkins-releng [Sat, 12 Aug 2023 11:38:05 +0000 (11:38 +0000)]
Release transportpce

18 months agoBug in freq-map topology update 96/107396/1
Balagangadhar (Bala) Bathula [Sat, 22 Jul 2023 00:34:35 +0000 (20:34 -0400)]
Bug in freq-map topology update

- When a service-create is initiated after the temp-service-create
  the temp-service boolean in Renderer Listener will still be true
  and it would not update the freq-map in the topology.
- During the service-create operation, we need to make sure this
  boolean is initialized to false.

JIRA: TRNSPRTPCE-748
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I301f820aa4f81696f262e211523e9e629a468aa0

18 months agoAdd if-cap-support for If-OTU4-ODU4 ports (7.1) 95/107395/1
Balagangadhar (Bala) Bathula [Wed, 19 Jul 2023 17:37:27 +0000 (13:37 -0400)]
Add if-cap-support for If-OTU4-ODU4 ports (7.1)

- Currently the if-capability support is missing for IfOTU4ODU4
  type ports for 7.1 devices.
- Port-mapping fails to mount the NE with a null pointer expection when
  the supporting-interface-capabilities are not present in MappingUtilImpl.
- Add code to avoid null-pointer expection, even when the MappingUtilImpl
  does not contain required supported-if-cap.

JIRA: TRNSPRTPCE-747

Change-Id: I0270f99a93a02107a7c9a66f49e9825c65b06242
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
18 months agoOptimize Binding->NormalizedNode transforms 94/107394/1
Robert Varga [Wed, 5 Jul 2023 22:19:48 +0000 (00:19 +0200)]
Optimize Binding->NormalizedNode transforms

We are running serialization twice. Store the result in a local variable
and check against that.

Change-Id: Ifeb3fd35f2c0f066015c1f262deefb2667459372
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
18 months agoAdd OLM support for 7.1 model TPDR with 100G ports 93/107393/1
Balagangadhar (Bala) Bathula [Wed, 7 Jun 2023 16:26:37 +0000 (12:26 -0400)]
Add OLM support for 7.1 model TPDR with 100G ports

- A 7.1 OpenROADM transponder can contain ports that support
  both 100G and 400G.
- The current OLM transponder power setting only supports 400G.
- Using the supported-interface capability, enable the support for
  100G rates (if-OCH-OTU4-ODU4 and if-OCH types)

JIRA: TRNSPRTPCE-745
Change-Id: If53e401c4fed9fb87bea1fe88180217846cc1220
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
18 months agoBump upstream dependencies to Ar-SR2 88/107388/2
Gilles Thouenon [Tue, 8 Aug 2023 14:35:23 +0000 (16:35 +0200)]
Bump upstream dependencies to Ar-SR2

Adopt:
- odlparent-12.0.7
- yangtools-10.0.9
- mdsal-11.0.12
- netconf-5.0.7
- transportpce-models-18.2.0
- lighty-app-parent-18.1.0

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

22 months agoBump project version to 7.2.0-SNAPSHOT 33/105733/1
Gilles Thouenon [Fri, 28 Apr 2023 12:01:02 +0000 (14:01 +0200)]
Bump project version to 7.2.0-SNAPSHOT

Start Ar-SR2 development iteration

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

22 months agoBump upstream dependencies to Ar-SR1 22/105722/1
Gilles Thouenon [Thu, 20 Apr 2023 06:38:19 +0000 (08:38 +0200)]
Bump upstream dependencies to Ar-SR1

Adopt:
- odlparent-12.0.5
- yangtools-10.0.6
- mdsal-11.0.9
- netconf-5.0.6
- transportpce-models-18.1.0

Change-Id: I16272888d4c136157ab12b2065e837663faf9321
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 months agoMigrate Optional.get() callers 56/105456/1
Gilles Thouenon [Tue, 25 Apr 2023 16:33:46 +0000 (18:33 +0200)]
Migrate Optional.get() callers

Use Optional.orElseThrow() instead.

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

22 months agoRefactor Lighty.io build TransportPCEImpl step 2 55/105455/1
guillaume.lambert [Tue, 25 Apr 2023 13:04:46 +0000 (15:04 +0200)]
Refactor Lighty.io build TransportPCEImpl step 2

JIRA: TRNSPRTPCE-736
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id6eef88803e341249a75ab516afc2d7ec6a446a6
(cherry picked from commit a3e438d26a071955866bd610928c4fbc63fdc69c)

22 months agoEnforce checkstyle warnings in Lighty.io build 54/105454/1
guillaume.lambert [Mon, 24 Apr 2023 10:09:58 +0000 (12:09 +0200)]
Enforce checkstyle warnings in Lighty.io build

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

22 months agoClean Lighty.io build warnings 53/105453/1
guillaume.lambert [Mon, 24 Apr 2023 09:49:49 +0000 (11:49 +0200)]
Clean Lighty.io build warnings

JIRA: TRNSPRTPCE-736
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9fcec2279896092ab85a0a01194170e3e6a4e776
(cherry picked from commit 47f48f4207903f915047986b1eef2897c0e128f1)

22 months agoRefactor Lighty.io build TransportPCEImpl 52/105452/2
guillaume.lambert [Mon, 24 Apr 2023 09:41:05 +0000 (11:41 +0200)]
Refactor Lighty.io build TransportPCEImpl

JIRA: TRNSPRTPCE-736
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iec7cee56849a9aaf1a7127e259d7f49bf59143bf
(cherry picked from commit a5674b310f25344ead7c1202aabd5e79205104f5)

22 months agoUpdate Lighty baseUrl to RFC8040 07/105707/1
Christophe Betoule [Mon, 17 Apr 2023 14:02:27 +0000 (16:02 +0200)]
Update Lighty baseUrl to RFC8040

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

22 months agoAdd functional tests for regenerator type 06/105706/1
Balagangadhar (Bala) Bathula [Fri, 31 Mar 2023 11:53:04 +0000 (07:53 -0400)]
Add functional tests for regenerator type

- Verify the port-mapping data
- Verify renderer for creating regenerator interfaces
- Verify renderer for deleting regnerator interfaces

JIRA: TRNSPRTPCE-740
Change-Id: I6051cc4b30d46f1e6b7baf8624ee88aea0a9d4f1
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
22 months agoEnable 400G rate for OC service-format 05/105705/1
Balagangadhar (Bala) Bathula [Wed, 5 Apr 2023 23:27:15 +0000 (19:27 -0400)]
Enable 400G rate for OC service-format

- Currently only 100G is supported for OC service-format

JIRA: TRNSPRTPCE-741
Change-Id: I92d0305610892828573a73373473c196b89b8868
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
22 months agoRefactor SH ServicehandlerImplTest 04/105704/1
guillaume.lambert [Thu, 6 Apr 2023 13:43:51 +0000 (15:43 +0200)]
Refactor SH ServicehandlerImplTest

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

22 months agoRefactor SH ServicehandlerComplianceCheck 03/105703/1
guillaume.lambert [Thu, 6 Apr 2023 12:16:43 +0000 (14:16 +0200)]
Refactor SH ServicehandlerComplianceCheck

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

22 months agoRemove import-error checks from tox pylint profile 02/105702/1
guillaume.lambert [Wed, 12 Apr 2023 13:01:12 +0000 (15:01 +0200)]
Remove import-error checks from tox pylint profile

New Gerrit-tox JJB configuration breaks pylint request import,
what causes false positives in the CI

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4539
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1e04d41e84d88e048ed00832ab494ca84d2bd7e1

22 months agoCI: Prepare tox.ini for new tox version 01/105701/1
Matthew Watkins [Wed, 5 Apr 2023 10:22:11 +0000 (11:22 +0100)]
CI: Prepare tox.ini for new tox version

whitelist_externals is now deprecated in favor of allowlist_externals
https://tox.wiki/en/latest/changelog.html#v4-0-0rc4-2022-12-06

space separator is no longer valid for passenv variable lists
https://tox.wiki/en/latest/changelog.html#v4-0-3-2022-12-08

Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4539
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: If9322889b1d4625f0ddc58966adda92f614887c7
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
22 months agoRefactor SH CatalogValidation 58/105358/1
guillaume.lambert [Thu, 6 Apr 2023 10:02:55 +0000 (12:02 +0200)]
Refactor SH CatalogValidation

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

22 months agoRefactor SH CatalogDataUtil 57/105357/1
guillaume.lambert [Tue, 4 Apr 2023 09:18:33 +0000 (11:18 +0200)]
Refactor SH CatalogDataUtil

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

22 months agoRefactor SH CatalogMapper 56/105356/1
guillaume.lambert [Tue, 4 Apr 2023 08:47:10 +0000 (10:47 +0200)]
Refactor SH CatalogMapper

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

22 months agoCatalog RPC Implementation 16/105316/2
Roshan Joyce [Fri, 17 Mar 2023 12:01:36 +0000 (17:31 +0530)]
Catalog RPC Implementation

Also, declare CatalogDataStoreOperations as a Component

JIRA: TRNSPRTPCE-714
Signed-off-by: Roshan Joyce <roshan.joyce@fujitsu.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9fe5b5c00d0145ceabd2edb7961f1f3e46065fee
(cherry picked from commit 30a7633eb11290b9fc0da5116fb9f6bec50710cc)

22 months agoUnregister DataTreeChangeListeners 15/105315/2
Gilles Thouenon [Fri, 17 Mar 2023 11:23:09 +0000 (12:23 +0100)]
Unregister DataTreeChangeListeners

- use a list of listeners of DataTreeChangeListeners when serveral are
registered.
- unregister all listeners when the bundle stop.
- add a check in few provider UT

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

22 months agoRemove inventory-blueprint.xml file 14/105314/2
Gilles Thouenon [Thu, 16 Mar 2023 17:25:47 +0000 (18:25 +0100)]
Remove inventory-blueprint.xml file

- convert ListenerProvider into a Component
- remove some useless properties
- manage all object instantiation from ListenerProvider

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

22 months agoRemove dmaap-blueprint.xml file 13/105313/2
Gilles Thouenon [Thu, 16 Mar 2023 14:44:31 +0000 (15:44 +0100)]
Remove dmaap-blueprint.xml file

Convert DmaapClientProvider into a Component.

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

22 months agoRemove nobinotifications-blueprint.xml file 12/105312/2
Gilles Thouenon [Thu, 16 Mar 2023 14:22:38 +0000 (15:22 +0100)]
Remove nobinotifications-blueprint.xml file

- convert NbiNotificationsProvider into a Component
- adapt NbiNotificationsProviderTest accordingly

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I298b7d1bf6f18f06a0bb3687f4df2363311629cf
(cherry picked from commit 0e5a378adbacbe904865e220a01fded2f597ff07)

22 months agoRemove tapi-blueprint.xml file 11/105311/2
Gilles Thouenon [Thu, 16 Mar 2023 12:37:32 +0000 (13:37 +0100)]
Remove tapi-blueprint.xml file

- Convert TapiProvider to OSGI DS.
- Adapt TapiProviderTest accordingly.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I1e4ece95c9604d56d8eb00300866d1d5f5359fbe
(cherry picked from commit 40f7b65724bf8057eb16cd544b5135c9fdb36606)

22 months agoTurn TapiNetworkModelListenerImpl into a Component 10/105310/2
Gilles Thouenon [Thu, 16 Mar 2023 11:21:17 +0000 (12:21 +0100)]
Turn TapiNetworkModelListenerImpl into a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I1ce5ae37fae9ea0f887fa5a580e5c0fad593d1b7
(cherry picked from commit 7138d52b04b59ac8d6c73f28808bd4ac6d2f59d7)

22 months agoConvert TapiNetworkUtilsImpl into a Component 09/105309/2
Gilles Thouenon [Thu, 16 Mar 2023 09:27:27 +0000 (10:27 +0100)]
Convert TapiNetworkUtilsImpl into a Component

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

22 months agoConvert TapiNetworkModelServiceImpl to a Component 08/105308/2
Gilles Thouenon [Thu, 16 Mar 2023 09:09:51 +0000 (10:09 +0100)]
Convert TapiNetworkModelServiceImpl to a Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I07d791a46372b17725faa440c093a4419290908b
(cherry picked from commit 6b42803ee32ed5f8f75a8edd51b73e80e0db830c)

22 months agoFix small bug in TapiTopologyImplExceptionTest 07/105307/2
Gilles Thouenon [Thu, 16 Mar 2023 08:42:39 +0000 (09:42 +0100)]
Fix small bug in TapiTopologyImplExceptionTest

Use mock of TapiLink instead of its real implementation

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

22 months agoConvert TapiLinkImpl into a Component 06/105306/2
Gilles Thouenon [Wed, 15 Mar 2023 20:05:28 +0000 (21:05 +0100)]
Convert TapiLinkImpl into a Component

- Rename TapiLink into TapiLinkImpl and create its associated interface.
- Turn TapiLinkImpl into a Component.
- Adapt blueprint file removing TapiLink bean.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ied0c259a1e6186e0eb3d4fd2993ce150736111ab
(cherry picked from commit 3f83898ef90e47a1c85722caff67ee8243dc51fd)

22 months agoRemove static instantiations from RendererProvider 05/105305/2
Gilles Thouenon [Tue, 14 Mar 2023 12:56:43 +0000 (13:56 +0100)]
Remove static instantiations from RendererProvider

Convert DeviceRendererRPCImpl and TransportPCEServicePathRPCImpl
into Components.

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I678a717ac1ffdbadc181bc789c8066700c51b56c
(cherry picked from commit 807b93874f23be2f81da25b066204a827a05368a)

22 months agoMigrate servicehandler module to OSGI DS 04/105304/2
Gilles Thouenon [Wed, 15 Mar 2023 17:13:20 +0000 (18:13 +0100)]
Migrate servicehandler module to OSGI DS

- convert ServicehandlerImpl into a Component
- remove unused parameter in ServicehandlerImpl
- convert ServicehandlerProvider into a Component
- replace the implementation type of listener parameters by their
respective interface one in ServicehandlerProvider
- convert NetworkModelListenerImpl into a Component
- convert PceListenerImpl into a Component
- convert RendererListenerImpl into a Component
- convert ServiceListener into a Component
- create interfaces for pce, renderer and network listeners
- remove the servicehandler-blueprint.xml file
- adapt ServicehandlerProviderTest, ServicehandlerImplTest and
TapiConnectivityImplTest UT consequently

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7440863e9ae4df0bc209bab6674e7531b9521e53
(cherry picked from commit 3eaaac5f8c8bd69d6505053c00a014509b8ece6c)

22 months agoTurn ServiceDataStoreOperationsImpl into Component 03/105303/2
Gilles Thouenon [Tue, 14 Mar 2023 17:28:00 +0000 (18:28 +0100)]
Turn ServiceDataStoreOperationsImpl into Component

JIRA: TRNSPRTPCE-736
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I70cf38993e3e20445b398078f7a4c46b1afedba5
(cherry picked from commit 1bb411b2d1b153a9d3be27081daf3e624c507c68)

22 months agoActivate Swagger for Lighty 02/105302/2
Christophe Betoule [Tue, 28 Mar 2023 14:07:55 +0000 (16:07 +0200)]
Activate Swagger for Lighty

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

22 months agoRemove pce-blueprint.xml file 01/105301/2
Gilles Thouenon [Tue, 14 Mar 2023 14:55:40 +0000 (15:55 +0100)]
Remove pce-blueprint.xml file

Since now only PceProvider remains, convert it to OSGi DS.
Also, refactor PceProviderTest.

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

22 months agoConvert PathComputationServiceImpl into Component 00/105300/2
Gilles Thouenon [Tue, 14 Mar 2023 14:41:02 +0000 (15:41 +0100)]
Convert PathComputationServiceImpl into Component

Adapt UT and blueprint file accordingly.

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

22 months agoConvert GnpyConsumerImpl into a Component 99/105299/2
Gilles Thouenon [Tue, 14 Mar 2023 14:24:42 +0000 (15:24 +0100)]
Convert GnpyConsumerImpl into a Component

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

22 months agoRemove renderer-blueprint 98/105298/2
Gilles Thouenon [Tue, 14 Mar 2023 09:02:53 +0000 (10:02 +0100)]
Remove renderer-blueprint

Convert RendererProvier into a Component.
Instantiate manually DeviceRendererRPCImpl and
TransportPCEServicePathRPCImpl since OSGI does not start them directly
when they are also converted to Components.

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

22 months agoConvert RendererServiceOperationsImpl to Component 97/105297/2
Gilles Thouenon [Mon, 13 Mar 2023 17:19:46 +0000 (18:19 +0100)]
Convert RendererServiceOperationsImpl to Component

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

22 months agoRemove olm-blueprint.xml file 96/105296/2
Gilles Thouenon [Mon, 13 Mar 2023 16:59:55 +0000 (17:59 +0100)]
Remove olm-blueprint.xml file

Since now only OlmProvider remains, convert it to OSGi DS.

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

22 months agoConvert OlmPowerServiceRpcImpl into a Component 95/105295/2
Gilles Thouenon [Mon, 13 Mar 2023 16:37:17 +0000 (17:37 +0100)]
Convert OlmPowerServiceRpcImpl into a Component

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

22 months agoConvert OlmPowerServiceImpl into a Component 94/105294/2
Gilles Thouenon [Mon, 13 Mar 2023 16:25:58 +0000 (17:25 +0100)]
Convert OlmPowerServiceImpl into a Component

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

22 months agoConvert PowerMgmtImpl of olm into a Component 93/105293/2
Gilles Thouenon [Mon, 13 Mar 2023 16:05:16 +0000 (17:05 +0100)]
Convert PowerMgmtImpl of olm into a Component

- clean olm-blueprint.xml file
- remove unused databroker property
- adapt few UT

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

22 months agoConvert OtnDeviceRendererServiceImpl to Component 92/105292/2
Gilles Thouenon [Mon, 13 Mar 2023 14:18:38 +0000 (15:18 +0100)]
Convert OtnDeviceRendererServiceImpl to Component

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

22 months agoConvert DeviceRendererServiceImpl to a Component 91/105291/2
Gilles Thouenon [Mon, 13 Mar 2023 11:04:22 +0000 (12:04 +0100)]
Convert DeviceRendererServiceImpl to a Component

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

22 months agoRefactor renderer-blueprint 90/105290/2
Gilles Thouenon [Mon, 13 Mar 2023 10:24:13 +0000 (11:24 +0100)]
Refactor renderer-blueprint

- remove beans that instantiate the different implementations of
  OpenRoadmInterface to do the equivalent directly in
  OpenRoadmInterfaceFactory
- adapt one UT

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

22 months agoRemove networkmodel-blueprint.xml 89/105289/2
Gilles Thouenon [Sat, 11 Mar 2023 15:31:38 +0000 (16:31 +0100)]
Remove networkmodel-blueprint.xml

Convert NetworkModelProvider into a Component, rendering the blueprint
empty.

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

22 months agoConvert NetworkModelServiceImpl into a Component 88/105288/2
Gilles Thouenon [Sat, 11 Mar 2023 15:30:13 +0000 (16:30 +0100)]
Convert NetworkModelServiceImpl into a Component

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

22 months agoQuiet and check lighty.io build in the CI 87/105287/2
guillaume.lambert [Wed, 22 Mar 2023 13:24:10 +0000 (14:24 +0100)]
Quiet and check lighty.io build in the CI

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

22 months agoBump lighty to 18.0.0 released version 17/105317/2
Gilles Thouenon [Tue, 4 Apr 2023 06:34:17 +0000 (08:34 +0200)]
Bump lighty to 18.0.0 released version

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

22 months agoBump Lighty build to Argon 86/105286/1
guillaume.lambert [Tue, 21 Mar 2023 09:40:04 +0000 (10:40 +0100)]
Bump Lighty build to Argon

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

22 months agoConvert FrequenciesServiceImpl into Component 85/105285/1
Gilles Thouenon [Sat, 11 Mar 2023 09:46:23 +0000 (10:46 +0100)]
Convert FrequenciesServiceImpl into Component

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

22 months agoCorrections to developer Guide for Ar 84/105284/1
orenais [Tue, 21 Mar 2023 17:19:03 +0000 (18:19 +0100)]
Corrections to developer Guide for Ar

JIRA: TRNSPRTPCE-737
Change-Id: I17a0c57d81f9c2ff82fdde015225798703ec982f
Signed-off-by: orenais <olivier.renais@orange.com>
22 months agoBump project version to 7.1.0-SNAPSHOT 55/105155/1
Gilles Thouenon [Mon, 3 Apr 2023 11:33:35 +0000 (13:33 +0200)]
Bump project version to 7.1.0-SNAPSHOT

Start the Ar-SR1 development iteration.

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

23 months agoBump to transportpce-models-18.0.1 08/105108/1
Gilles Thouenon [Wed, 29 Mar 2023 15:29:05 +0000 (17:29 +0200)]
Bump to transportpce-models-18.0.1

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

23 months agoBump upstreams 07/105107/1
Robert Varga [Tue, 28 Mar 2023 12:32:08 +0000 (14:32 +0200)]
Bump upstreams

Adopt:
- aaa-0.17.7
- netconf-5.0.4

Change-Id: I4f33a23efda7c14dcb8b66869d0fdbb056d39172
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoIncrease delay before PCE functional test start 06/105106/1
Gilles Thouenon [Sat, 18 Mar 2023 12:14:47 +0000 (13:14 +0100)]
Increase delay before PCE functional test start

Wait a litle bit that the controller has finished to initialize all
bundles before loading test files in datastore.

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

23 months agoBump versions to 7.0.1-SNAPSHOT 05/105105/1
Robert Varga [Wed, 29 Mar 2023 11:00:59 +0000 (13:00 +0200)]
Bump versions to 7.0.1-SNAPSHOT

tpce-7.0.0 has been released, bump version to prevent potential
confusion.

Change-Id: Ibbc96b35862cf066bd86f9e0924fbcf7acb3b2dd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
23 months agoUse Maven 3.8.8 in CI CentOS install script 04/105104/1
Gilles Thouenon [Fri, 17 Mar 2023 07:51:38 +0000 (08:51 +0100)]
Use Maven 3.8.8 in CI CentOS install script

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

23 months agoUpadte docs/conf.yaml file to Argon 04/104804/1
Gilles Thouenon [Wed, 8 Mar 2023 18:15:30 +0000 (19:15 +0100)]
Upadte docs/conf.yaml file to Argon

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

23 months agoUpdate .gitreview file to argon 03/104803/1
Gilles Thouenon [Wed, 8 Mar 2023 18:13:21 +0000 (19:13 +0100)]
Update .gitreview file to argon

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

23 months agoBump latest transportpce-models version 01/104801/1
Gilles Thouenon [Wed, 8 Mar 2023 13:54:21 +0000 (14:54 +0100)]
Bump latest transportpce-models version

Adopt transportpce-models-18.0.0

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

23 months agoOperational config data to include regen support 57/104357/5
Balagangadhar (Bala) Bathula [Thu, 9 Feb 2023 18:12:56 +0000 (13:12 -0500)]
Operational config data to include regen support

- Add new circuit-packs with circuit-pack-mode configured as REGEN
- Add xponder subtree for two line ports, with xponder-type as regen
- Add connection-map data for two regen ports.
- Adapt functional test since there is an additional node in topologies

JIRA: TRNSPRTPCE-633
Change-Id: I08794f8779572982138bdbf937014583734fda40
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
23 months agoSupport create/delete interfaces for regen 09/102609/14
Balagangadhar Bathula [Tue, 11 Oct 2022 19:54:56 +0000 (15:54 -0400)]
Support create/delete interfaces for regen

- For regen xpdr-type create OTSi, OTSi-group, OTUCn
  and ODUCn on source and destination TP
- Add support to delete interfaces for regen xpdr-type

JIRA: TRNSPRTPCE-633
Change-Id: Ia044ebe9f6c9d1746a1959b8980ba9ec0af7a8cb
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
23 months agoUpdate port-mapping data for REGEN xpdr-type 02/102502/13
Balagangadhar Bathula [Thu, 29 Sep 2022 03:39:16 +0000 (23:39 -0400)]
Update port-mapping data for REGEN xpdr-type

- For a REGEN/REGEN-UNI xpdr-node-type, update the
  port-mapping data with regen-profile information
- Enable the REGEN/REGEN-UNI xpdr-node-type to appear
  in the Open ROADM topology layer (network model)

JIRA: TRNSPRTPCE-690

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

23 months agoPort-mapping to support regen capabilities 95/102495/14
Balagangadhar (Bala) Bathula [Tue, 14 Feb 2023 16:51:40 +0000 (11:51 -0500)]
Port-mapping to support regen capabilities

- Addition of regen-profiles container, which lists
  regen profiles
- Change attribute xponder-type to xpdr-type
- Change in revision date

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

23 months agoSlight refactor of common PortMappingVersion221 79/104079/3
Guillaume Lambert [Fri, 28 Oct 2022 12:52:36 +0000 (14:52 +0200)]
Slight refactor of common PortMappingVersion221

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

23 months agoHack to update degree port on portmapping 17/102917/11
Gilles Thouenon [Fri, 28 Oct 2022 12:52:36 +0000 (14:52 +0200)]
Hack to update degree port on portmapping

- make the 'port-oper-state' of a ROADM degree port in portmapping
  depends on both the device port state and the OTS operational state
  supported by the port (if any)
- add a detection of changeNotification on an interface in
  DeviceListener221

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

23 months agoUse QNAME constant 52/104652/3
Gilles Thouenon [Wed, 1 Mar 2023 07:35:50 +0000 (08:35 +0100)]
Use QNAME constant

Use QNAME constant instead of creating manually the qualified name of a
YANG container during de/serialization processes.

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

23 months agoReactive FrequenciesService UT 51/104651/3
Gilles Thouenon [Tue, 28 Feb 2023 12:43:00 +0000 (13:43 +0100)]
Reactive FrequenciesService UT

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

23 months agoMigrate tapi module to JUnit5 50/104650/3
Gilles Thouenon [Mon, 27 Feb 2023 17:56:40 +0000 (18:56 +0100)]
Migrate tapi module to JUnit5

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

23 months agoMigrate servicehandler module to JUnit5 49/104649/3
Gilles Thouenon [Mon, 27 Feb 2023 15:22:03 +0000 (16:22 +0100)]
Migrate servicehandler module to JUnit5

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

23 months agoMigrate renderer module to JUnit5 48/104648/3
Gilles Thouenon [Mon, 27 Feb 2023 11:18:28 +0000 (12:18 +0100)]
Migrate renderer module to JUnit5

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

23 months agoFix string issue in OpenRoadmInterfaceException 47/104647/3
Gilles Thouenon [Mon, 27 Feb 2023 11:16:06 +0000 (12:16 +0100)]
Fix string issue in OpenRoadmInterfaceException

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

23 months agoMigrate pce module to JUnit5 46/104646/3
Gilles Thouenon [Mon, 27 Feb 2023 08:42:00 +0000 (09:42 +0100)]
Migrate pce module to JUnit5

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

23 months agoMigrate olm module to JUnit5 45/104645/3
Gilles Thouenon [Sun, 26 Feb 2023 14:37:16 +0000 (15:37 +0100)]
Migrate olm module to JUnit5

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

23 months agoMigrate networkmodel module to JUnit5 44/104644/3
Gilles Thouenon [Sun, 26 Feb 2023 13:37:44 +0000 (14:37 +0100)]
Migrate networkmodel module to JUnit5

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

23 months agoMigrate nbinotifications module to JUnit5 43/104643/3
Gilles Thouenon [Sat, 25 Feb 2023 20:19:13 +0000 (21:19 +0100)]
Migrate nbinotifications module to JUnit5

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

23 months agoMigrate dmaap-client module to JUnit5 42/104642/3
Gilles Thouenon [Sat, 25 Feb 2023 19:09:23 +0000 (20:09 +0100)]
Migrate dmaap-client module to JUnit5

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

23 months agoMigrate common module to JUnit5 41/104641/3
Gilles Thouenon [Sat, 25 Feb 2023 18:40:28 +0000 (19:40 +0100)]
Migrate common module to JUnit5

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

23 months agoBump latest argon upstream dependencies 62/104762/1
Gilles Thouenon [Fri, 3 Mar 2023 12:39:03 +0000 (13:39 +0100)]
Bump latest argon upstream dependencies

Adopt:
- odlparent-12.0.03
- yangtools-10.0.4
- mdsal-11.0.7
- netconf-5.0.3

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

2 years agoLeverage Map Ref in PCE PostAlgoPathValidator 79/104379/9
guillaume.lambert [Mon, 20 Feb 2023 12:27:46 +0000 (13:27 +0100)]
Leverage Map Ref in PCE PostAlgoPathValidator

CatalogUtils compute many signal parameters stored with double values.
They are passed to many methods arguments and modified in many places
in PCE PostAlgoPathValidator.
Leveraging Map references to group these double values would help to
simplify the code by avoiding long list of such parameters
and allowing their values to be modified directly inside intermediate
functions.

TODO:
Ideally, this work should be generalized to the whole CatalogUtils
class. Also as Double is immutable, it prevents from updating directly
Map values here. Apache proposes a MutableDouble alternative.
Of course, there is still the possibility to use double[] arrays.
But w/o key names to describe, the code reading will be harder.

JIRA: TRNSPRTPCE-725
Change-Id: Iff3cf98d82cb53dc3cc89714b92a2e3bf77157fb
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
2 years agoRefactor PCE graph PostAlgoPathValidator step 3 40/104340/12
guillaume.lambert [Thu, 9 Feb 2023 10:50:30 +0000 (11:50 +0100)]
Refactor PCE graph PostAlgoPathValidator step 3

checkOSNR() method is very long and has a hich cyclomatic complexity.
The main reason is that it proposes a common heuristic for both AZ & ZA
directions to compute the OSNR. This creates a lot of checks in this
function to identify the direction currently used.
Those multiple checks also affects the code overall efficiency.
- dispatch checkOSNR() content in two methods checkOSNRaz()
  and checkOSNRaz() to check the current direction only once.

The second reason is that it contains a for-loop where the iterator
value is hidden to decorrelate the indexes of the verticles retrieved
by the treatment
and also to back-pedal in the ZA direction case, what is now useless.
- unhide pathElement and merge it to the n iterator
- use decrement operator in the ZA direction for-loop case

Once that done, checkOSNRaz() and checkOSNRaz() looks very similar.
And it may look clever to regroup them again by inverting the order in
the edges list rather than using a decrement operator for the ZA
direction. But this is technically impossible w/o reintroducing many
direction checks because links are retrieved with the getter
link().getOppositeLink() in the ZA direction rather than simply
link() in the AZ direction...

Also the first two iterations and the last iteration of the loops
require specific treatments since they are at the edges of the line,
what causes checks at each iteration.
These other checks affect the code overall efficiency too.
- split the for-loop in three parts to avoid checking iterator value
  at each iteration
- raise an error for unsupported cases (degree at the edges and
  back to back xponder) and remove related code

The third reason is that the for-loop use a switch case to identify
each node type. Each block contains a different treatment to compute
the signal impairments & characteristics.
- create various intermediate functions to compute signal
  characteristics at each step and reduce case-blocks size.

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

2 years agoMerge changes I082f82ac,I951224b0,Icecd1b21,Ifafa74b6,I9b384c72, ...
Gilles Thouenon [Wed, 1 Mar 2023 10:19:10 +0000 (10:19 +0000)]
Merge changes I082f82ac,I951224b0,Icecd1b21,Ifafa74b6,I9b384c72, ...

* changes:
  Speed up functional tests execution
  Clean maven files
  Bump upstream dependencies to Argon
  Use NetworkTransactionService to access to the DS
  Remove close method from RequestProcessor
  Reimplement RequestProcessor
  Remove some forced transaction closure
  Change getter in ConvertORTopoToTapiFullTopo
  Update tapi device notification functional test