transportpce.git
8 months agoDeclare SuppressFBWarnings in imports 54/107554/1
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

8 months agoSkip the temp-service-create if already exists 38/107338/3
Balagangadhar (Bala) Bathula [Tue, 8 Aug 2023 03:01:44 +0000 (23:01 -0400)]
Skip the temp-service-create if already exists

- If a temp-service with a commonId already exists in the
  data-store (temp-service-list), and if the temp-service-create
  is issued, then the controller should fail with an error
  message, indicating it already exists.
- Add code to check if the same commonId exists in the datastore
  and add a failed response.
- Add a new Junit test to check it

JIRA: TRNSPRTPCE-753
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9f425e9febd8820f3053ecd5dfdd14f8a66279c4

9 months agoMerge "Add if-cap-support for If-OTU4-ODU4 ports (7.1)"
Guillaume Lambert [Thu, 27 Jul 2023 14:14:14 +0000 (14:14 +0000)]
Merge "Add if-cap-support for If-OTU4-ODU4 ports (7.1)"

9 months agoMerge "Update temp-service-list"
Guillaume Lambert [Thu, 27 Jul 2023 10:31:42 +0000 (10:31 +0000)]
Merge "Update temp-service-list"

9 months agoMerge "Bug in freq-map topology update"
Guillaume Lambert [Thu, 27 Jul 2023 10:31:23 +0000 (10:31 +0000)]
Merge "Bug in freq-map topology update"

9 months agoAdd a Xtesting entry to combine all tests cases 52/107052/4
guillaume.lambert [Tue, 25 Jul 2023 14:23:55 +0000 (16:23 +0200)]
Add a Xtesting entry to combine all tests cases

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

9 months agoImprove TPCE Xtesting tests cases 51/107051/2
guillaume.lambert [Tue, 25 Jul 2023 13:28:29 +0000 (15:28 +0200)]
Improve TPCE Xtesting tests cases

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

9 months agoUpdate temp-service-list 68/107068/1
Balagangadhar (Bala) Bathula [Tue, 25 Jul 2023 19:49:40 +0000 (15:49 -0400)]
Update temp-service-list

- If a service is implemented using service-create RPC and
  there exists an assoicated temp-service, then the temp-service-list
  needs to updated.
- Using commonId as the key, update the temp-service-list after the
  service is implmented (succeeds and becomes operational).

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

9 months agoAdd a workaround note to Xtesting INSTALL.txt 31/107031/1
guillaume.lambert [Tue, 25 Jul 2023 11:17:29 +0000 (13:17 +0200)]
Add a workaround note to Xtesting INSTALL.txt

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

9 months agoBug in freq-map topology update 68/106968/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

9 months agoAdd if-cap-support for If-OTU4-ODU4 ports (7.1) 35/106935/2
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>
9 months agoMerge changes from topic "xtesting"
Guillaume Lambert [Tue, 18 Jul 2023 11:57:31 +0000 (11:57 +0000)]
Merge changes from topic "xtesting"

* changes:
  Add INSTALL.txt and ansible playbook for Xtesting
  Xtesting Dockerfile init

10 months agoOptimize Binding->NormalizedNode transforms 31/106831/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>
10 months agoMigrate nullness annotations 30/106830/1
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>
10 months agoAdd INSTALL.txt and ansible playbook for Xtesting 95/106795/3
guillaume.lambert [Tue, 4 Jul 2023 11:04:08 +0000 (13:04 +0200)]
Add INSTALL.txt and ansible playbook for Xtesting

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

10 months agoXtesting Dockerfile init 14/81014/22
guillaume.lambert [Tue, 26 Mar 2019 13:51:22 +0000 (14:51 +0100)]
Xtesting Dockerfile init

- create a Dockerfile sample
  to retrieve transportPCE master branch content
  and install required dependencies to run tox and build the project
- create a YAML configuration w/ a sample shell testcase
  to run pre-commit via tox

Change-Id: I96d1ab3c9439c13dbb8bd4877c314fb14ac2188c
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
10 months agoAdd OLM support for 7.1 model TPDR with 100G ports 06/106406/3
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>
11 months agoRefactor SH Renderer Listener notification support 80/106380/1
guillaume.lambert [Mon, 5 Jun 2023 07:52:05 +0000 (09:52 +0200)]
Refactor SH Renderer Listener notification support

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

11 months agoAdd notification support for service-rpc-result 24/106124/6
Balagangadhar (Bala) Bathula [Mon, 22 May 2023 14:31:00 +0000 (10:31 -0400)]
Add notification support for service-rpc-result

- This RPC allows to notify the results of the path-computation
  such as assigned frequency, width, operational-mode-id,
  power range, GSNR and OSNR
- Applicable only for temp-service-create RPC
- Use-cases include IP-over-WDM and alien wavelength
- For IP-over-WDM or alien wavlength use case

JIRA: TRNSPRTPCE-743
Change-Id: I80258fad0b7ff3fc484203c9000a825e3565ea26
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
11 months agoDisable optical control mode for temp service 22/106122/5
Balagangadhar (Bala) Bathula [Fri, 19 May 2023 17:37:39 +0000 (13:37 -0400)]
Disable optical control mode for temp service

- Currently, when a temp-service is created, all
  the interfaces are pushed to the NE.
- If roadm-connections (crossconnets) are created without
  the ingress power-power, it would create alarms.
- For temp-service create, we keep the optical-control-mode
  in "off" state

Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I9ccf6a9da74ff040a988ed86d3089e5b5a38060c

11 months agoUpdate path-description data for temp service list 91/105791/5
Balagangadhar (Bala) Bathula [Mon, 1 May 2023 18:42:12 +0000 (14:42 -0400)]
Update path-description data for temp service list

- When a temp-service is created, the temp-service list should
  indicate the transport assigment details.
- Using path description data of the temp-service, update
  transport assignment details such as min-freq, max-freq,
  spectral-width and central-frquency.

Change-Id: If59a863eee3cd5419ee97490fee8fbfde6ab18cd
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
11 months agoPath description YANG update 66/105766/2
Balagangadhar (Bala) Bathula [Mon, 1 May 2023 20:47:56 +0000 (16:47 -0400)]
Path description YANG update

- Currently path-description container does not include
  central-frequency and spectral width for a given service.
- Add central-frequency and spectral-width leafs to the
  A-Z direction and Z-A direction containers.
- Add received GNSR, OSNR, min/max power and operational-mode-id
  details.
- Update the revision date and necessary imports.

Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I52fe413276ccedf8390123e22bc46f3c76e9e810
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
12 months agoBump upstream dependencies to Ar-SR1 32/105532/6
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>
12 months agoMigrate Optional.get() callers 69/105669/3
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

12 months agoRefactor Lighty.io build TransportPCEImpl step 2 53/105653/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

12 months agoEnforce checkstyle warnings in Lighty.io build 44/105644/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

12 months agoClean Lighty.io build warnings 43/105643/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

12 months agoRefactor Lighty.io build TransportPCEImpl 42/105642/1
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

12 months agoMerge "Add functional tests for regenerator type"
Guillaume Lambert [Fri, 21 Apr 2023 14:03:06 +0000 (14:03 +0000)]
Merge "Add functional tests for regenerator type"

12 months agoMerge "Enable 400G rate for OC service-format"
Guillaume Lambert [Fri, 21 Apr 2023 14:02:59 +0000 (14:02 +0000)]
Merge "Enable 400G rate for OC service-format"

12 months agoUpdate Lighty baseUrl to RFC8040 78/105478/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

12 months agoAdd functional tests for regenerator type 25/105225/6
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>
12 months agoMerge "Refactor SH ServicehandlerImplTest"
Guillaume Lambert [Thu, 13 Apr 2023 06:54:05 +0000 (06:54 +0000)]
Merge "Refactor SH ServicehandlerImplTest"

12 months agoEnable 400G rate for OC service-format 65/105265/4
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>
12 months agoRemove import-error checks from tox pylint profile 22/105422/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

12 months agoCI: Prepare tox.ini for new tox version 51/105251/2
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>
13 months agoRefactor SH ServicehandlerImplTest 79/105279/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

13 months agoRefactor SH ServicehandlerComplianceCheck 76/105276/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

13 months agoRefactor SH CatalogValidation 73/105273/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

13 months agoRefactor SH CatalogDataUtil 13/105213/2
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

13 months agoRefactor SH CatalogMapper 09/105209/3
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

13 months agoBump project version to 8.0.0-SNAPSHOT 56/105156/4
Gilles Thouenon [Mon, 3 Apr 2023 11:38:32 +0000 (13:38 +0200)]
Bump project version to 8.0.0-SNAPSHOT

Start K development iteration.

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

13 months agoBump lighty to 18.0.0 released version 01/105201/3
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

13 months agoMerge "Catalog RPC Implementation"
Guillaume Lambert [Wed, 5 Apr 2023 17:51:38 +0000 (17:51 +0000)]
Merge "Catalog RPC Implementation"

13 months agoCatalog RPC Implementation 63/104963/6
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)

13 months agoMerge "Activate Swagger for Lighty"
Gilles Thouenon [Mon, 3 Apr 2023 10:50:10 +0000 (10:50 +0000)]
Merge "Activate Swagger for Lighty"

13 months agoUnregister DataTreeChangeListeners 62/104962/7
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)

13 months agoRemove inventory-blueprint.xml file 56/104956/7
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)

13 months agoRemove dmaap-blueprint.xml file 55/104955/7
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)

13 months agoRemove nobinotifications-blueprint.xml file 54/104954/6
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)

13 months agoRemove tapi-blueprint.xml file 53/104953/6
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)

13 months agoTurn TapiNetworkModelListenerImpl into a Component 52/104952/7
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)

13 months agoConvert TapiNetworkUtilsImpl into a Component 51/104951/7
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)

13 months agoConvert TapiNetworkModelServiceImpl to a Component 50/104950/7
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)

13 months agoFix small bug in TapiTopologyImplExceptionTest 49/104949/7
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)

13 months agoConvert TapiLinkImpl into a Component 48/104948/7
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)

13 months agoRemove static instantiations from RendererProvider 47/104947/7
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)

13 months agoMigrate servicehandler module to OSGI DS 46/104946/6
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)

13 months agoTurn ServiceDataStoreOperationsImpl into Component 45/104945/6
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)

13 months agoMerge "Corrections to developer Guide for Ar"
Gilles Thouenon [Thu, 30 Mar 2023 10:16:00 +0000 (10:16 +0000)]
Merge "Corrections to developer Guide for Ar"

13 months agoBump to transportpce-models-18.0.1 03/105103/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

13 months agoBump versions to 7.0.1-SNAPSHOT 98/105098/2
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>
13 months agoActivate Swagger for Lighty 90/105090/1
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

13 months agoBump upstreams 86/105086/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>
13 months agoRemove pce-blueprint.xml file 44/104944/5
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

13 months agoConvert PathComputationServiceImpl into Component 43/104943/5
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

13 months agoConvert GnpyConsumerImpl into a Component 42/104942/5
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

13 months agoRemove renderer-blueprint 41/104941/5
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

13 months agoConvert RendererServiceOperationsImpl to Component 40/104940/5
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

13 months agoRemove olm-blueprint.xml file 39/104939/5
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

13 months agoConvert OlmPowerServiceRpcImpl into a Component 38/104938/5
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

13 months agoIncrease delay before PCE functional test start 67/104967/4
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

13 months agoConvert OlmPowerServiceImpl into a Component 37/104937/4
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

13 months agoConvert PowerMgmtImpl of olm into a Component 36/104936/4
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

13 months agoConvert OtnDeviceRendererServiceImpl to Component 35/104935/4
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

13 months agoConvert DeviceRendererServiceImpl to a Component 34/104934/4
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

13 months agoRefactor renderer-blueprint 33/104933/4
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

13 months agoRemove networkmodel-blueprint.xml 32/104932/4
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

13 months agoConvert NetworkModelServiceImpl into a Component 31/104931/3
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

13 months agoQuiet and check lighty.io build in the CI 84/104984/5
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

13 months agoBump Lighty build to Argon 71/104971/3
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

13 months agoCorrections to developer Guide for Ar 77/104977/5
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>
13 months agoConvert FrequenciesServiceImpl into Component 30/104930/2
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

13 months agoUse Maven 3.8.8 in CI CentOS install script 58/104958/3
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

14 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

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

14 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

14 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

14 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

14 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

14 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

14 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

14 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

14 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

14 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

14 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

14 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

14 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