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>
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
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
Gilles Thouenon [Sat, 25 Feb 2023 09:30:35 +0000 (10:30 +0100)]
Speed up functional tests execution
Some functional test suites remained configured with a rather long delay
between each test. Homogenize the whole to a rather short value.
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I082f82ac48b2e8530c008e311004ac52f0f0fd7c
Gilles Thouenon [Mon, 23 Jan 2023 17:48:27 +0000 (18:48 +0100)]
Clean maven files
To remove compilation warnings wrt dependency declarations (especially
test scope)
JIRA: TRNSPRTPCE-719
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I951224b0e39c7775f29422d58eb790d39cbf572a
Gilles Thouenon [Fri, 20 Jan 2023 08:37:24 +0000 (09:37 +0100)]
Bump upstream dependencies to Argon
Adopt:
- odlparent-12.0.2
- yangtools-10.0.3
- mdsal-11.0.6
- netconf-5.0.2
- transportpce-models-18.0.0-SNAPSHOT
Also
- add netconf-topology dependency and adapt some netconf imports
- adapt GNPy UT
- adapt karaf message in functional tests
TODO: need to upgrade lighty to 18.0.0 when available
JIRA: TRNSPRTPCE-719
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Icecd1b21a25c1fc7f66b31f090a4a614ba741c6f
guillaume.lambert [Wed, 25 Jan 2023 11:59:21 +0000 (12:59 +0100)]
Improve functional tests launcher pytest support
Using pytest from the python interpreter can generate unwanted behavior.
https://askubuntu.com/questions/
1222958/
why-does-ctrl-c-not-kill-python-running-in-terminal
Typically when using Ctrl-C, subprocess are not properly killed.
This was not happening with nosetests before.
Unfortunately it has been superseded by nose2 which is not properly
working with the current testsuite and is not under active development.
- replace "python3 -m pytest" in launch script by pytest-3 or pytest
when available.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I871fa0fce48e176427b07809138a0e4ba1e03247
Gilles Thouenon [Thu, 23 Feb 2023 11:38:27 +0000 (12:38 +0100)]
Use NetworkTransactionService to access to the DS
Adapt one GNPy UT to use NetworkTransactionService instead
of managing the transaction directly from a new databroker, since this
dependency is injected and available.
JIRA: TRNSPRTPCE-727
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ifafa74b69918f584b9a715e55b3140650b615013
Gilles Thouenon [Sat, 25 Feb 2023 08:55:41 +0000 (09:55 +0100)]
Remove close method from RequestProcessor
Wit new implementation of RequestProcessor, transactions are better
managed, and their closure is assured by the commit. Letting the user
interfere in transaction management can make the application very
instable.
So, remove close method from NetworkTransactionService interface.
JIRA: TRNSPRTPCE-727
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9b384c729d105795d0047d51149f9bf9342ce298
Gilles Thouenon [Wed, 22 Feb 2023 15:15:15 +0000 (16:15 +0100)]
Reimplement RequestProcessor
To fix datastore concurrency access between openroadm-topology update
and tapi-topology update threads.
JIRA: TRNSPRTPCE-727
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ia71f89659da20549ecd3488f53e838623a8a96df
Gilles Thouenon [Thu, 16 Feb 2023 07:51:14 +0000 (08:51 +0100)]
Upgrade device 7.1.0 sims version
Use new sims-device 7.1.0 version to fix xslt issue related to regen
functionality.
JIRA: TRNSPRTPCE-726
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9109f17c007cfb69ec20443214b7536ce2c3afec
Gilles Thouenon [Wed, 22 Feb 2023 14:42:06 +0000 (15:42 +0100)]
Remove some forced transaction closure
Forcing closure of all read and write transactions prevents from
finishing executing pending code by all threads that are waiting for the
locking mechanism to release.
JIRA: TRNSPRTPCE-727
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ia00aed2dd1f77aebaf291afbe077c9de96ae6608
Gilles Thouenon [Wed, 22 Feb 2023 15:10:42 +0000 (16:10 +0100)]
Change getter in ConvertORTopoToTapiFullTopo
JIRA: TRNSPRTPCE-728
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I2246a8aa328a3a4c96f064b8aaea744b47c68686
Gilles Thouenon [Wed, 22 Feb 2023 15:31:25 +0000 (16:31 +0100)]
Update tapi device notification functional test
Clean openroadm-topology and restore the device port state at the end of
the tests.
JIRA: TRNSPRTPCE-67
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I93d50fdcf8abad9a088dc743f0f5a41f733c80ae
guillaume.lambert [Wed, 8 Feb 2023 16:59:37 +0000 (17:59 +0100)]
Refactor PCE graph PostAlgoPathValidator step 2
JIRA: TRNSPRTPCE-725
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5215fa76506a60a516a566510d65fe7d3742df5b
guillaume.lambert [Thu, 16 Feb 2023 12:53:58 +0000 (13:53 +0100)]
Fix docs Git Hooks dead URL
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I18ea5ab3193f9cf0dd388bfb95f5bcb08edc660d
guillaume.lambert [Wed, 8 Feb 2023 14:36:32 +0000 (15:36 +0100)]
Refactor PCE graph PostAlgoPathValidator step 1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I53a7ea45dcecafe2cedcd020abefab9e92179c2a
Robert Varga [Thu, 9 Feb 2023 17:06:23 +0000 (18:06 +0100)]
Remove common-blueprint.xml
Convert OpenRoadmInterfacesImpl into a Component, rendering the
blueprint empty.
Change-Id: I8c3274437352b63858c397a1004928f5b27c7106
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 16:59:30 +0000 (17:59 +0100)]
Turn PortMappingImpl into a component
This is a simple component with three constituents. Split it out of
blueprint.
Also, remove portMapppingVersionXX parameter from
OpenRoadmUnterfacesImplXX and adapt code consequently.
Change-Id: I0036d0609276374538a26ec13fa03153446e8644
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 16:54:04 +0000 (17:54 +0100)]
Turn CrossConnectImpl into a component
This is a simple component, which instantiates three different objects.
Split it out of blueprint.
Change-Id: Id95c123fb641ea55483e49ff3465b35e0a4078c1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 16:47:22 +0000 (17:47 +0100)]
Remove RequestProcessor.readTx
This field is completely unused, remove it.
Change-Id: I56f0334a2c33d32103be3774e8bb9a8a6fae893a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 16:44:28 +0000 (17:44 +0100)]
Turn NetworkTransactionImpl into a component
This is a simple component, which is using RequestProcessor internally,
split both out of blueprint.
Also, adapt UT consequently to remove usage of RequestProcessor.
Change-Id: I0f953793f2319bd8a639c17dcb3cd0a548a032c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Gilles Thouenon [Sun, 12 Feb 2023 08:19:26 +0000 (09:19 +0100)]
Fix small issues in nbinotifications module
- remove unused property in TopicManager
- remove unused variable in PublisherTest
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I92a63c4df337891724bfa08bb7fcebf0eda7da4e
Robert Varga [Thu, 9 Feb 2023 16:22:10 +0000 (17:22 +0100)]
Make DeviceTransactionManagerImpl configurable
Add an @ObjectClassDefinition and @Designate the configuration to use.
This the manager to be configured at runtime. It will be restarted
whenever the configuration changes.
Change-Id: I1fdd40c9fe11c3204af3794a3d0220b653973427
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 16:02:59 +0000 (17:02 +0100)]
Convert DeviceTransactionManagerImpl into a cmpnt
This is a simplistic component, split it off from blueprint. While we
are at it, mark hard-coded constants for future tuning.
Change-Id: Ibedae091c20b4c41a269ee76bbc18cabc9e0d720
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 15:43:52 +0000 (16:43 +0100)]
Convert MappingUtilsImpl into a Component
This is as simple a component as they come: a single dependency and a
single service published. Split it out of the blueprint container.
Change-Id: Ib94603ca9e7f54639444cde9c1cba30967d3b23b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 9 Feb 2023 15:27:24 +0000 (16:27 +0100)]
Remove use of ODL blueprint extensions
The only use here revolves around odl:type=default, which has been
deprecated for some time now. Eliminate these instructions and also
remove blueprint-cm namespace where it is not used.
Change-Id: I13e9ebf2749a0d5d0207de9a14c77f340f5ffd3f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Gilles Thouenon [Mon, 13 Feb 2023 07:50:39 +0000 (07:50 +0000)]
Merge "Refactor networkmodel serv. FrequenciesServiceImpl"
Gilles Thouenon [Mon, 13 Feb 2023 07:50:16 +0000 (07:50 +0000)]
Merge "Refactor PCE networkanalyzer PceLink Test"
Gilles Thouenon [Mon, 13 Feb 2023 07:49:49 +0000 (07:49 +0000)]
Merge "Refactor PCE networkanalyzer PceLink"
Gilles Thouenon [Mon, 13 Feb 2023 07:49:18 +0000 (07:49 +0000)]
Merge "Refactor PCE graph tests"
guillaume.lambert [Tue, 7 Feb 2023 20:42:17 +0000 (21:42 +0100)]
Refactor PCE NodeUtils
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic0994eb20f7b464524c79c114cf8f543b349027d
guillaume.lambert [Mon, 6 Feb 2023 21:12:50 +0000 (22:12 +0100)]
Refactor PCE networkanalyzer PceLink Test
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifd76eb47e2f2cb03599a46f7c390623978c5e9cf
guillaume.lambert [Mon, 6 Feb 2023 16:13:09 +0000 (17:13 +0100)]
Refactor PCE networkanalyzer PceLink
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I843573e55f4ca85ee6d982bac49e1933ecaf18a7
guillaume.lambert [Mon, 6 Feb 2023 15:24:58 +0000 (16:24 +0100)]
Refactor networkmodel serv. FrequenciesServiceImpl
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iec989c82571b2dab46272374b2cc9820baef2954
guillaume.lambert [Mon, 6 Feb 2023 19:55:22 +0000 (20:55 +0100)]
Refactor PCE graph tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I696ac44c312592e321e980048d1194ffa21d61e9
guillaume.lambert [Mon, 6 Feb 2023 15:26:35 +0000 (16:26 +0100)]
Use a coherent style in common InstanceIdentifiers
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I61c46ac37e08a283cfbcc90b8fb0382aef93d8b4
orenais [Tue, 31 Jan 2023 16:00:04 +0000 (17:00 +0100)]
Autonomous impairment aware path computation
- in PostAlgoValidator, adapt checkOSNR to scan the path in both AtoZ
and ZtoA directions, and to calculate impairments using catalog
primitives
- add to CatalogUtils some complementary primitives that were missing
getPceRoadmAmpOutputPower
- add to PceOpticalNode and PceLink missing methods
- refactor GraphTest for integration test associated with path
computation and add portMapping2.json and or-base-topology.json with
adpted OMS parameters
JIRA: TRNSPRTPCE-517 TRNSPRTPCE-605
Change-Id: I00973dcd0898d786c421c46f031d9b2b915514e8
Signed-off-by: orenais <olivier.renais@orange.com>
guillaume.lambert [Thu, 2 Feb 2023 19:05:57 +0000 (20:05 +0100)]
Fix pylint issues
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6bdd76c2478859bfc34be3937a60821369c04b3c
guillaume.lambert [Thu, 26 Jan 2023 19:16:52 +0000 (20:16 +0100)]
Add test_utils ODL startup opt-out support
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I28b94e6ff6cf94c4bc9643992aef6c0ff68ba41a
guillaume.lambert [Sat, 28 Jan 2023 09:21:45 +0000 (10:21 +0100)]
Restore TAPI feat install w/ Karaf client in tests
JIRA: TRNSPRTPCE-701
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I15eca75c9187192bf02c27f585c991c547a61d18
Sangwook Ha [Thu, 26 Jan 2023 19:10:38 +0000 (11:10 -0800)]
Use karaf client batch mode
Karaf 'client' command has a batch mode option ('-b') to take commands
from stdin without requiring TTY. Hence this option makes it possible
to run the command without getting affected by the Karaf terminal
property setup issue.
JIRA: TRNSPRTPCE-701
Change-Id: I885df3ee97fd528e151edcf98bb648ac9ebb2cc5
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
guillaume.lambert [Wed, 25 Jan 2023 10:27:49 +0000 (11:27 +0100)]
Remove websocket config from post-install script
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib8fe1b5c8bd6d990f14310782405fc79e691d84d
guillaume.lambert [Tue, 24 Jan 2023 13:40:24 +0000 (14:40 +0100)]
Unenforce Lighty use in CI
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibdd0447cc985dc177090b2d563b47935939bb68a
guillaume.lambert [Wed, 25 Jan 2023 10:17:31 +0000 (11:17 +0100)]
Workaround to install tapi feature in func tests
JIRA: TRNSPRTPCE-701
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I148587b258066e90930012cba2ca7387af75e8f2