Guillaume Lambert [Thu, 27 Jul 2023 10:31:23 +0000 (10:31 +0000)]
Merge "Bug in freq-map topology update"
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
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
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
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
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
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>
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>
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
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>
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>
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
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>
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
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>
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>
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>
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
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
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
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
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
Guillaume Lambert [Fri, 21 Apr 2023 14:03:06 +0000 (14:03 +0000)]
Merge "Add functional tests for regenerator type"
Guillaume Lambert [Fri, 21 Apr 2023 14:02:59 +0000 (14:02 +0000)]
Merge "Enable 400G rate for OC service-format"
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
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>
Guillaume Lambert [Thu, 13 Apr 2023 06:54:05 +0000 (06:54 +0000)]
Merge "Refactor SH ServicehandlerImplTest"
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>
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
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>
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
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
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
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
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
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
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
Guillaume Lambert [Wed, 5 Apr 2023 17:51:38 +0000 (17:51 +0000)]
Merge "Catalog RPC Implementation"
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)
Gilles Thouenon [Mon, 3 Apr 2023 10:50:10 +0000 (10:50 +0000)]
Merge "Activate Swagger for Lighty"
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
Gilles Thouenon [Thu, 30 Mar 2023 10:16:00 +0000 (10:16 +0000)]
Merge "Corrections to developer Guide for Ar"
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
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>
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
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>
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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>
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
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
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
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>
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>
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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>
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