transportpce.git
2 months agoError due to duplicate roadm node id key in TAPI 91/112491/16
Joakim Törnqvist [Mon, 8 Jul 2024 11:05:26 +0000 (13:05 +0200)]
Error due to duplicate roadm node id key in TAPI

Resolves an issue where an IllegalArgumentException was thrown
due to duplicate node id keys for ROADMs. A node id such as
ROADM-B-SRG1 was transformed into ROADM, instead of ROADM-B.

JIRA: TRNSPRTPCE-803
Change-Id: I1198454b3749dbfeaa1329b3efc94e28c3f6ddd2
Signed-off-by: Joakim Törnqvist <joakim.tornqvist@smartoptics.com>
2 months agoError in TAPI creating frequency ranges 38/112438/25
Joakim Törnqvist [Wed, 3 Jul 2024 10:27:16 +0000 (12:27 +0200)]
Error in TAPI creating frequency ranges

When an OpenROADM service is converted to TAPI, an exception
(ArrayIndexOutOfBoundsException) is thrown.
A byte array (size 96) was used when the code was actually expecting
size 768 (i.e. 96 x 8), when trying to create a Map<Double, Double>
with frequency ranges.

The use of method getFreqMapFromBitSet in ConvertORToTapiTopology
has been replaced with the package
org.opendaylight.transportpce.tapi.frequency.

A refactored version of getFreqMapFromBitSet can be found in the class
org.opendaylight.transportpce.tapi.frequency.NumericFrequency.

JIRA: TRNSPRTPCE-802
Change-Id: I423507decaae38b44d9f6968882179c3ec1b11d4
Signed-off-by: Joakim Törnqvist <joakim.tornqvist@smartoptics.com>
2 months agoNew Tapi package dealing with frequency BitSets 37/112437/22
Joakim Törnqvist [Wed, 3 Jul 2024 10:25:45 +0000 (12:25 +0200)]
New Tapi package dealing with frequency BitSets

Refactored code creating classes capable of converting
byte to BitSet to numeric frequency ranges.

e.g. byte[] = {-1} -> 191.325:191.375 THz

Each byte in an array is treated as 8 bits. Meaning an array
of 96 bytes is treated as a BitSet of 768 bits. The bits may
subsequently be converted to a map where the key is the
lower frequency and the value is the upper frequency in a range.

The package treats each signed byte at "face value". FlexGrid
or FixGrid data are treated equally.

Examples
byte[] = {1}       -> BitSet: {0}               -> 191.325:191.33125
byte[] = {15}      -> Bitset: {0,1,2,3}         -> 191.325:191.35
byte[] = {-16}     -> BitSet: {4,5,6,7}         -> 191.35:191.375
byte[] = {-1}      -> BitSet: {0,1,2,3,4,5,6,7} -> 191.325:191.375
byte[] = {-128}    -> BitSet: {7}               -> 191.36875:191.375
byte[] = {-128, 1} -> BitSet: {7,8}             -> 191.36875:191.38125

Package Overview

The main parts of this package are the classes AvailableGrid and
NumericFrequency. AvailableGrid is used to ease converting
a byte array to either assigned (used) or available frequencies
represented by a BitSet.

AvailableGridFactory provides a way to instantiate an AvailableGrid
object using either available or used frequency grid byte data.

The method getFreqMapFromBitSet in ConvertORToTapiTopology has
been modified and copied to NumericFrequency and is used to
convert a bitset to a Map<Double, Double> (numeric frequency range).

The interface Math is intended to make it easier to unit test the code.
The implementation of Math (i.e. FrequencyMath) simply wraps calls to
GridUtils.getStartFrequencyFromIndex(...) and
GridUtils.getStopFrequencyFromIndex(...).
Since GridUtils depends on global constants, any changes to those
constants may result in unit tests failing. The interface 'Math'
provides a way to test the code using predictable data.

Example usage:

/**
 * This method converts a byte array (e.g. 96 elements) representing
 * frequency ranges into a BitSet (i.e. 768 bits), and finally into
 * a Map<Double, Double> where the key represents the start frequency
 * and the value the end frequency in a range.
 *
 * In short, this example will convert...
 *     byte[] = {-1}
 * ...into...
 *      Map<Double, Double> = 191.325:191.375
 */
public Map<Double, Double> availableMap(byte[] availableByteMap) {

    Available available = new AvailableGrid(availableByteMap);

    // This object will help us convert an instance of 'Available'
    // into a numeric frequency range.
    Numeric numericFrequency = new NumericFrequency(
            GridConstant.START_EDGE_FREQUENCY,
            GridConstant.EFFECTIVE_BITS,
            new FrequencyMath()
    );

    // Convert BitSet data contained in the bitMap object
    // into a frequency range map.
    // Note: If instead we want the assigned frequencies
    //       we could execute:
    //       numericFrequency.assignedFrequency(available):
    return numericFrequency.availableFrequency(available);
}

JIRA: TRNSPRTPCE-802
Change-Id: I578abad37351eb4ead5e8907207f1384df27f09a
Signed-off-by: Joakim Törnqvist <joakim.tornqvist@smartoptics.com>
2 months agoFrequency rounding error in GridUtils 26/113326/3
Joakim Törnqvist [Wed, 28 Aug 2024 12:06:10 +0000 (14:06 +0200)]
Frequency rounding error in GridUtils

There is a frequency rounding error in the class GridUtils, methods
 - getStartFrequencyFromIndex(int index)
 - getStopFrequencyFromIndex(int index)

As an example, GridUtils.getStartFrequencyFromIndex(1) will return
191.33124999999998 instead of 191.33125.

HOW TO REPRODUCE

@Test
void testStartEnd() {

    System.out.println(" Index |        Start       |      End ");
    System.out.println(
        " ----- |--------------------|--------------------");

    for (int i = 0; i < 8; i++) {
        BigDecimal start = GridUtils.getStartFrequencyFromIndex(i);
        BigDecimal end = GridUtils.getStopFrequencyFromIndex(i);

        String message =
            String.format(" %5d | %18s | %18s ", i, start, end);

        System.out.println(message);
    }
}

The above code will output (note index 1 and 6 in the table):

 Index |        Start       |      End
 ----- |--------------------|--------------------
     0 |            191.325 |          191.33125
     1 | 191.33124999999998 | 191.33749999999998
     2 |           191.3375 |          191.34375
     3 |          191.34375 |          191.35000
     4 |             191.35 |          191.35625
     5 |          191.35625 |          191.36250
     6 | 191.36249999999998 | 191.36874999999998
     7 |          191.36875 |          191.37500

After this commit the same code above will produce:

 Index |        Start       |      End
 ----- |--------------------|--------------------
     0 |            191.325 |          191.33125
     1 |          191.33125 |          191.33750
     2 |           191.3375 |          191.34375
     3 |          191.34375 |          191.35000
     4 |             191.35 |          191.35625
     5 |          191.35625 |          191.36250
     6 |           191.3625 |          191.36875
     7 |          191.36875 |          191.37500

JIRA: TRNSPRTPCE-812
Change-Id: Idcc40d2c1aca2bd18ac0fcc5daed26c004ed7a58
Signed-off-by: Joakim Törnqvist <joakim.tornqvist@smartoptics.com>
2 months agoBump upstream dependencies for 2024.09 Scandium 73/112973/6
Gilles Thouenon [Thu, 15 Aug 2024 07:23:46 +0000 (09:23 +0200)]
Bump upstream dependencies for 2024.09 Scandium

Adopt:
- odlparent-14.0.3
- yangtools-14.0.4
- mdsal-14.0.2
- netconf-8.0.1
- transportpce-models-21.0.0-SNAPSHOT

Also,
- update dependencies in pom.xml files due to package rename and
  associated imports
- adapt the implementation of DeviceListeners
- disable the tox buildlighty's vote in the CI

JIRA: TRNSPRTPCE-815
Change-Id: Id31ee13f052c4d8718a9553fed82abb9386d831e
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
2 months agoImprove lightynode installation process 30/113330/2
Gilles Thouenon [Fri, 30 Aug 2024 08:55:43 +0000 (10:55 +0200)]
Improve lightynode installation process

The same version of lightynode simulator is used for all functional
tests. We no longer need to install it several times before each test
series.
- improve lightynode installation process
- adapt also tox.ini

JIRA: TRNSPRTPCE-813
Change-Id: I380fa9bb2a876e2b3ed083ee335bf004926b262c
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
2 months agoIncrease the kafka producer reconnect backoff time 12/113312/1
Gilles Thouenon [Tue, 27 Aug 2024 14:32:02 +0000 (16:32 +0200)]
Increase the kafka producer reconnect backoff time

Configure the kafka producer with a reconnection time at 10min (instead
of 500ms) to avoid polluting the logs with too many warnings messages.

JIRA: TRNSPRTPCE-807
Change-Id: Ie48800105bdeed8e3525d693cda1fc8e22c9bd24
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
3 months agoSearch available frequencies in TAPI cause error 56/112356/13
Joakim Törnqvist [Thu, 27 Jun 2024 13:02:31 +0000 (15:02 +0200)]
Search available frequencies in TAPI cause error

Resolves an issue causing a NoSuchElementException when
TAPI is activated and an OpenROADM service is copied to TAPI.

The exception was thrown during an iteration while attempting
to filter out available bitsets by using string comparison
that would never be true:

"AvailFreqMapsKey{mapName=cband}" != "cband"

JIRA: TRNSPRTPCE-801
Change-Id: I507c0e602fdee92df39e75ef0f9af2d2f23739e9
Signed-off-by: Joakim Törnqvist <joakim.tornqvist@smartoptics.com>
3 months agoFix shellcheck in installMavenUbuntu script 10/112910/1
Gilles Thouenon [Wed, 31 Jul 2024 08:30:38 +0000 (10:30 +0200)]
Fix shellcheck in installMavenUbuntu script

Change-Id: Ifdf2d839674f63018682ea0c45c84c468b099722
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
3 months agoMerge "Bump CI scripts to Ubuntu 20.04"
Gilles Thouenon [Wed, 31 Jul 2024 08:19:32 +0000 (08:19 +0000)]
Merge "Bump CI scripts to Ubuntu 20.04"

3 months agoBump CI scripts to Ubuntu 20.04 22/112222/6
Gilles Thouenon [Tue, 18 Jun 2024 08:34:23 +0000 (10:34 +0200)]
Bump CI scripts to Ubuntu 20.04

Build node on the CI have migrated from CentOS to Ubuntu-2004 which
already supports different versions of java.
- remove old installMavenCentOS.sh script which is now obsolete
- replace it with installMavenUbuntu.sh which configures java-21 and
  install maven 3.9.8

Change-Id: I50c29126cb2797d1ba4c386284c4015f8079f6df
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
4 months agoMerge "Debug tool for openconfig proprietary extensions"
Guillaume Lambert [Thu, 20 Jun 2024 08:32:41 +0000 (08:32 +0000)]
Merge "Debug tool for openconfig proprietary extensions"

4 months agoBump few upstream dependencies for Ca-SR1 29/112229/1
Gilles Thouenon [Fri, 14 Jun 2024 06:15:50 +0000 (08:15 +0200)]
Bump few upstream dependencies for Ca-SR1

Adopt:
- netconf-7.0.7 (critical fix)
- transportpce-models-20.1.2

JIRA: TRNSPRTPCE-799
Change-Id: I57a8efa611f9e7d9f80ecf2905ed22bf3b1cec29
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 months agoDebug tool for openconfig proprietary extensions 68/111368/18
guillaume.lambert [Fri, 12 Apr 2024 13:27:31 +0000 (15:27 +0200)]
Debug tool for openconfig proprietary extensions

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

5 months agoFix CI Cent OS 8 configuration issue (workaround) 90/112090/12
guillaume.lambert [Wed, 12 Jun 2024 09:46:18 +0000 (11:46 +0200)]
Fix CI Cent OS 8 configuration issue (workaround)

- reverts commit 94578ec62abf23679af8557bde48e26e1b7bc7d7
  to reenable voting for checkbashisms and pre-commit

Mirrorlist URLs have been archived and moved to Cent OS vault.
https://forums.centos.org/viewtopic.php?t=78708&start=30
https://forums.centos.org/viewtopic.php?t=80698
This impacts Jenkins minions configuration.

- force vault use in yum repos config till this is fixed upstream

Change-Id: I87831c5fe4cb81031f75d42762e1ad16e296a3e5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 months agoConsolidate ConnectivityUtils 14/111214/6
orenais [Fri, 29 Mar 2024 14:42:11 +0000 (15:42 +0100)]
Consolidate ConnectivityUtils

- Add spectrum information to Cep
- Centralize Topological_mode & TopoUUID handling in TapiProvider
- Refactor ConnectivityUtils adding CreateRoadmCepAndClientNeps to
factorize & backporting createCepRoadm and createRoadmNep into
ConvertORToTapiTopology to call it from Tapilink
- Move method to calculate fiber parameters from PceLink to NetworkUtils
to call them in TapiLink
- Add methods to create OTS & OMS Cep in TapiLinkImpl at init
- Add method to build OTS-Cep-Spec from OR OMS
- Add Test for OTS & OMS cep
- Refactor TapiLinkImpl & TapiORListener
- AddTest for PhotonicMediaNodeEdgePointSpec in Test of
convertORTopoToFullTapiTopoTest
- adapt tapi constructors in lighty build

JIRA: TRNSPRTPCE-759
Signed-off-by: orenais <olivier.renais@orange.com>
Change-Id: I2a1aeb3c413b315c46c66723342888c497365b6f

5 months agoFix common GridUtils comments 46/112046/3
orenais [Fri, 17 May 2024 08:53:53 +0000 (10:53 +0200)]
Fix common GridUtils comments

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

5 months agorefactoTapi2.4 Final touch 45/112045/3
Gilles Thouenon [Sun, 9 Jun 2024 17:11:33 +0000 (19:11 +0200)]
refactoTapi2.4 Final touch

Backport commit b6c6d93979d076cf5dac84f18df3b15c312961c1 from
stable/calcium branch.
Fix a commit handling error during the development...

Change-Id: I603aa131ace9f23ee364eca86943c330405134bb
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: orenais <olivier.renais@orange.com>
5 months agoFix frequencies in TAPI ConvertORToTapiTopology 44/112044/3
orenais [Tue, 21 May 2024 12:34:34 +0000 (14:34 +0200)]
Fix frequencies in TAPI ConvertORToTapiTopology

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

5 months agoBump upstream dependencies to Ca-SR1 43/112043/3
Gilles Thouenon [Fri, 7 Jun 2024 18:41:15 +0000 (20:41 +0200)]
Bump upstream dependencies to Ca-SR1

Adopt:
- odlparent-13.1.3
- yangtools-13.0.6
- mdsal-13.0.4
- netconf-7.0.6
- transportpce-models-20.1.1

Aslo adapt lighty build to tapi code evolution.

JIRA: TRNSPRTPCE-799
Change-Id: If1a2e0f19b7dd2885dd952b271090dc46df44edd
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 months agoFix floating equality bug in tapi module 42/112042/2
Gilles Thouenon [Fri, 7 Jun 2024 19:19:21 +0000 (21:19 +0200)]
Fix floating equality bug in tapi module

Change-Id: Ied1dba218056fec63044055b94886c81009b12ae
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 months agoMake lighty build voting in the CI 41/112041/2
Gilles Thouenon [Wed, 22 May 2024 12:46:09 +0000 (14:46 +0200)]
Make lighty build voting in the CI

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

5 months agoFix tpce-lighty build 40/112040/2
Gilles Thouenon [Tue, 21 May 2024 15:47:32 +0000 (17:47 +0200)]
Fix tpce-lighty build

- get the RpcService from LightyServices
- change urn of yang modules instances

FIRA: TRNSPRTPCE-799
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I60abe1130a2136a740f041364742342e85d109cc

5 months agoFixup checkstyle issues 39/112039/2
Gilles Thouenon [Tue, 21 May 2024 14:32:42 +0000 (16:32 +0200)]
Fixup checkstyle issues

Move some variables.

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

5 months agoBump lighty to 20.0.0 58/112058/1
Gilles Thouenon [Mon, 10 Jun 2024 09:53:45 +0000 (11:53 +0200)]
Bump lighty to 20.0.0

Change-Id: I94a321d5a38e11b93bd76bc5b9437ef7c2d81c49
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 months agoMake tox pre-commit and checkbashism non voting 57/112057/1
Gilles Thouenon [Sat, 8 Jun 2024 07:50:09 +0000 (09:50 +0200)]
Make tox pre-commit and checkbashism non voting

These two tox test environments are systematically failing on the CI.
- checkbashisms can't be installed.
- idem with pre-commit?
Disable them for now while waiting to understand what is going on.

Change-Id: I9a1c946d922cfa821a7d77ae791bb2c6b3358a7f
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 months agoMerge "Refactor ConvertORTopoToTapiTopoTest"
Guillaume Lambert [Tue, 21 May 2024 07:27:00 +0000 (07:27 +0000)]
Merge "Refactor ConvertORTopoToTapiTopoTest"

6 months agoUpdate release in docs/conf.yaml 93/111693/2
guillaume.lambert [Tue, 14 May 2024 13:40:52 +0000 (15:40 +0200)]
Update release in docs/conf.yaml

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

6 months agoMerge "Power setup gainloss failure Junit test"
Guillaume Lambert [Tue, 14 May 2024 13:20:34 +0000 (13:20 +0000)]
Merge "Power setup  gainloss failure Junit test"

6 months agoMerge "Refactor TAPI utils TapiContext"
Guillaume Lambert [Tue, 14 May 2024 13:20:29 +0000 (13:20 +0000)]
Merge "Refactor TAPI utils TapiContext"

6 months agoRefactor ConvertORTopoToTapiTopoTest 85/111685/2
guillaume.lambert [Tue, 14 May 2024 09:30:44 +0000 (11:30 +0200)]
Refactor ConvertORTopoToTapiTopoTest

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

6 months agoMerge changes I04980c0b,Ib74e699a,I6ca86692,Ida6061da,Iea661424, ...
Guillaume Lambert [Mon, 13 May 2024 08:40:17 +0000 (08:40 +0000)]
Merge changes I04980c0b,Ib74e699a,I6ca86692,Ida6061da,Iea661424, ...

* changes:
  Refactor ConvertORTopoToFullTapiTopoTest step 7
  Refactor ConvertORTopoToFullTapiTopoTest step 6
  Refactor ConvertORTopoToFullTapiTopoTest step 5
  Refactor ConvertORTopoToFullTapiTopoTest step 4
  Refactor ConvertORTopoToFullTapiTopoTest step 3
  Refactor ConvertORTopoToFullTapiTopoTest step 2
  Refactor ConvertORTopoToFullTapiTopoTest step 1

6 months agoRefactor TAPI utils TapiContext 45/111545/3
guillaume.lambert [Sun, 28 Apr 2024 13:52:40 +0000 (15:52 +0200)]
Refactor TAPI utils TapiContext

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

6 months agoPower setup gainloss failure Junit test 37/111637/3
guillaume.lambert [Mon, 6 May 2024 10:38:35 +0000 (12:38 +0200)]
Power setup  gainloss failure Junit test

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

6 months agoAbort power setup if setting gainloss fails 80/111480/3
Jonas Mårtensson [Mon, 22 Apr 2024 12:25:34 +0000 (12:25 +0000)]
Abort power setup if setting gainloss fails

Currently, if changing control mode from power to gainloss fails on a
device, e.g. because it becomes disconnected, power setup just
continues with the next node.

This changes behaviour so that power setup is aborted instead and
service creation is rolled back.

JIRA: TRNSPRTPCE-798
Change-Id: I85f03f318c66a524ac91d62cf7459d01e9a5d021
Signed-off-by: Jonas Mårtensson <jonas.martensson@smartoptics.com>
6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 7 79/111579/2
guillaume.lambert [Thu, 2 May 2024 15:05:39 +0000 (17:05 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 7

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

6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 6 73/111573/3
guillaume.lambert [Thu, 2 May 2024 09:33:43 +0000 (11:33 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 6

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

6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 5 56/111556/3
guillaume.lambert [Tue, 30 Apr 2024 15:13:45 +0000 (17:13 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 5

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

6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 4 53/111553/3
guillaume.lambert [Tue, 30 Apr 2024 08:15:50 +0000 (10:15 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 4

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

6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 3 51/111551/3
guillaume.lambert [Mon, 29 Apr 2024 16:36:28 +0000 (18:36 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 3

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

6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 2 49/111549/4
guillaume.lambert [Mon, 29 Apr 2024 13:08:48 +0000 (15:08 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 2

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

6 months agoRefactor ConvertORTopoToFullTapiTopoTest step 1 47/111547/3
guillaume.lambert [Sun, 28 Apr 2024 23:09:58 +0000 (01:09 +0200)]
Refactor ConvertORTopoToFullTapiTopoTest step 1

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

6 months agoMerge "Bump transportpce-models upstream dependency"
Gilles Thouenon [Fri, 3 May 2024 05:46:36 +0000 (05:46 +0000)]
Merge "Bump transportpce-models upstream dependency"

6 months agoMerge changes I1e9ed1dd,I86ae4ee0
Guillaume Lambert [Thu, 2 May 2024 15:32:44 +0000 (15:32 +0000)]
Merge changes I1e9ed1dd,I86ae4ee0

* changes:
  Refactor TAPI TapiNetworkModelServiceImpl
  Rework TAPI TapiNetworkModelServiceImpl code style

6 months agoMerge "Refactor TAPI TopologyUtils"
Guillaume Lambert [Thu, 2 May 2024 15:32:36 +0000 (15:32 +0000)]
Merge "Refactor TAPI TopologyUtils"

6 months agoMerge "Refactor TAPI utils TapiLinkImpl"
Guillaume Lambert [Thu, 2 May 2024 15:32:28 +0000 (15:32 +0000)]
Merge "Refactor TAPI utils TapiLinkImpl"

6 months agoBump transportpce-models upstream dependency 78/111578/2
Gilles Thouenon [Thu, 2 May 2024 12:21:23 +0000 (14:21 +0200)]
Bump transportpce-models upstream dependency

Adopt transportpce-models-21.0.0-SNAPSHOT

Change-Id: I380da272eb7ac8bad66c8b42fc52ac2ce6f9eb3f
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
6 months agoRefactor TAPI utils TapiLinkImpl 46/111546/1
guillaume.lambert [Sun, 28 Apr 2024 14:56:02 +0000 (16:56 +0200)]
Refactor TAPI utils TapiLinkImpl

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

6 months agoRefactor TAPI TopologyUtils 19/111519/5
guillaume.lambert [Thu, 25 Apr 2024 09:34:43 +0000 (11:34 +0200)]
Refactor TAPI TopologyUtils

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

6 months agoRefactor TAPI TapiNetworkModelServiceImpl 82/111482/8
guillaume.lambert [Mon, 22 Apr 2024 14:30:57 +0000 (16:30 +0200)]
Refactor TAPI TapiNetworkModelServiceImpl

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

6 months agoRework TAPI TapiNetworkModelServiceImpl code style 81/111481/2
guillaume.lambert [Mon, 22 Apr 2024 12:33:20 +0000 (14:33 +0200)]
Rework TAPI TapiNetworkModelServiceImpl code style

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

6 months agoRefactor TAPI ConvertTapiTopoToAbstracted 76/111476/1
guillaume.lambert [Mon, 22 Apr 2024 09:27:24 +0000 (11:27 +0200)]
Refactor TAPI ConvertTapiTopoToAbstracted

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

6 months agoRework TAPI ConvertTapiTopoToAbstracted code style 75/111475/1
guillaume.lambert [Mon, 22 Apr 2024 09:11:14 +0000 (11:11 +0200)]
Rework TAPI ConvertTapiTopoToAbstracted code style

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

6 months agoAdd perltidy to pre-commit linters 82/111382/4
guillaume.lambert [Sun, 14 Apr 2024 18:36:35 +0000 (20:36 +0200)]
Add perltidy to pre-commit linters

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

7 months agoRun perltidy on debug tools 81/111381/1
guillaume.lambert [Sun, 14 Apr 2024 18:42:55 +0000 (20:42 +0200)]
Run perltidy on debug tools

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

7 months agoMerge "Fix ConvertORToTapiTopology getXpdrUsedWavelength"
Guillaume Lambert [Wed, 10 Apr 2024 11:13:44 +0000 (11:13 +0000)]
Merge "Fix ConvertORToTapiTopology getXpdrUsedWavelength"

7 months agoMerge changes I2927cbf5,I35d6b4ed,Iffd49368
Guillaume Lambert [Wed, 10 Apr 2024 07:56:12 +0000 (07:56 +0000)]
Merge changes I2927cbf5,I35d6b4ed,Iffd49368

* changes:
  Refactor TAPI topology ConvertORToTapiTopology
  Use Map in TAPI topology ConvertORToTapiTopology
  Fix some TAPI topology Upper/Lower Freq inversions

7 months agoFix ConvertORToTapiTopology getXpdrUsedWavelength 21/111321/1
guillaume.lambert [Mon, 8 Apr 2024 11:07:31 +0000 (13:07 +0200)]
Fix ConvertORToTapiTopology getXpdrUsedWavelength

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

7 months agoRefactor TAPI topology ConvertORToTapiTopology 16/111216/10
guillaume.lambert [Wed, 3 Apr 2024 10:49:05 +0000 (12:49 +0200)]
Refactor TAPI topology ConvertORToTapiTopology

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

7 months agoUse Map in TAPI topology ConvertORToTapiTopology 83/111283/6
guillaume.lambert [Fri, 5 Apr 2024 14:12:42 +0000 (16:12 +0200)]
Use Map in TAPI topology ConvertORToTapiTopology

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

7 months agoBump project version to 10.0.0-SNAPSHOT 77/111277/1
Gilles Thouenon [Fri, 5 Apr 2024 07:50:16 +0000 (09:50 +0200)]
Bump project version to 10.0.0-SNAPSHOT

Start next development iteration for Scandium.

Change-Id: I86f5af81c59aa4543a1ab8622e96ff9ec533cc22
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
7 months agoMerge "Refactor ORDM Full TAPI topology conversion"
Gilles Thouenon [Thu, 4 Apr 2024 15:39:44 +0000 (15:39 +0000)]
Merge "Refactor ORDM Full TAPI topology conversion"

7 months agoMerge "Refactor TAPI rpc GetTopologyDetailsImpl"
Gilles Thouenon [Thu, 4 Apr 2024 15:29:44 +0000 (15:29 +0000)]
Merge "Refactor TAPI rpc GetTopologyDetailsImpl"

7 months agoMerge "Bump netconf version to 7.0.4"
Gilles Thouenon [Thu, 4 Apr 2024 10:21:52 +0000 (10:21 +0000)]
Merge "Bump netconf version to 7.0.4"

7 months agoBump netconf version to 7.0.4 61/111261/1
Gilles Thouenon [Thu, 4 Apr 2024 08:16:59 +0000 (10:16 +0200)]
Bump netconf version to 7.0.4

JIRA: TRNSPRTPCE-782
Change-Id: I1eae0eecc610e477c465b1985466b8131bcdfd01
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
7 months agoRefactor TAPI rpc GetTopologyDetailsImpl 04/111104/6
guillaume.lambert [Wed, 27 Mar 2024 10:28:16 +0000 (11:28 +0100)]
Refactor TAPI rpc GetTopologyDetailsImpl

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

7 months agoFix some TAPI topology Upper/Lower Freq inversions 59/111259/1
guillaume.lambert [Thu, 4 Apr 2024 06:41:59 +0000 (08:41 +0200)]
Fix some TAPI topology Upper/Lower Freq inversions

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

7 months agoRefactor some small TAPI rpcs 02/111102/6
guillaume.lambert [Wed, 27 Mar 2024 08:59:15 +0000 (09:59 +0100)]
Refactor some small TAPI rpcs

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

7 months agoMerge "Refactor ORDM TAPI topology conversion"
Gilles Thouenon [Wed, 3 Apr 2024 15:56:06 +0000 (15:56 +0000)]
Merge "Refactor ORDM TAPI topology conversion"

7 months agoRefactor ORDM TAPI topology conversion 04/111204/3
guillaume.lambert [Tue, 2 Apr 2024 13:30:19 +0000 (15:30 +0200)]
Refactor ORDM TAPI topology conversion

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

7 months agoRefactor ORDM Full TAPI topology conversion 42/111142/5
guillaume.lambert [Fri, 29 Mar 2024 10:27:56 +0000 (11:27 +0100)]
Refactor ORDM Full TAPI topology conversion

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

7 months agoFix TAPI utils listener DOM iteration bug 69/111169/3
guillaume.lambert [Tue, 2 Apr 2024 06:47:32 +0000 (08:47 +0200)]
Fix TAPI utils listener DOM iteration bug

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

7 months agoRefactor TAPI utils TapiListener 36/111136/3
guillaume.lambert [Thu, 28 Mar 2024 10:14:30 +0000 (11:14 +0100)]
Refactor TAPI utils TapiListener

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

7 months agoRefactor few TAPI rpcs 10/111110/3
guillaume.lambert [Wed, 27 Mar 2024 15:17:50 +0000 (16:17 +0100)]
Refactor few TAPI rpcs

Change-Id: Ib6d5843c674ea7f2c5eacffe4df7a6c3b6b45b3a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
7 months agoMerge "Refactor TAPI topology TapiPortMappingListener"
Gilles Thouenon [Thu, 28 Mar 2024 07:13:01 +0000 (07:13 +0000)]
Merge "Refactor TAPI topology TapiPortMappingListener"

7 months agoRefactor TAPI topology TapiPortMappingListener 12/111112/2
guillaume.lambert [Wed, 27 Mar 2024 15:33:22 +0000 (16:33 +0100)]
Refactor TAPI topology TapiPortMappingListener

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

7 months agoRefactor TAPI topology TAPIOrLinkListener 11/111111/2
guillaume.lambert [Wed, 27 Mar 2024 15:22:18 +0000 (16:22 +0100)]
Refactor TAPI topology TAPIOrLinkListener

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

7 months agoMerge "Refactor TAPI rpc DeleteConnectivityServiceImpl"
Gilles Thouenon [Wed, 27 Mar 2024 12:35:29 +0000 (12:35 +0000)]
Merge "Refactor TAPI rpc DeleteConnectivityServiceImpl"

7 months agoRefactor TAPI rpc DeleteConnectivityServiceImpl 01/111101/1
guillaume.lambert [Wed, 27 Mar 2024 08:36:12 +0000 (09:36 +0100)]
Refactor TAPI rpc DeleteConnectivityServiceImpl

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

7 months agoMerge "Refactor TAPI rpc CreateConnectivityServiceImpl"
Gilles Thouenon [Wed, 27 Mar 2024 08:28:22 +0000 (08:28 +0000)]
Merge "Refactor TAPI rpc CreateConnectivityServiceImpl"

7 months agoRefactor TAPI 2.4 62/110362/13
orenais [Fri, 23 Feb 2024 16:34:04 +0000 (17:34 +0100)]
Refactor TAPI 2.4

JIRA: TRNSPRTPCE-735
Signed-off-by: orenais <olivier.renais@orange.com>
Change-Id: Iebccbefb0ddfb1ec902916a18e9447046c7101e2

7 months agoRefactor TAPI rpc CreateConnectivityServiceImpl 58/110858/3
guillaume.lambert [Tue, 19 Mar 2024 07:11:25 +0000 (08:11 +0100)]
Refactor TAPI rpc CreateConnectivityServiceImpl

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

7 months agoMerge "SH slight clean-up after Ca bump"
Gilles Thouenon [Mon, 25 Mar 2024 16:36:20 +0000 (16:36 +0000)]
Merge "SH slight clean-up after Ca bump"

7 months agoMerge "Refactor a few renderer RPCs"
Gilles Thouenon [Mon, 25 Mar 2024 12:50:22 +0000 (12:50 +0000)]
Merge "Refactor a few renderer RPCs"

7 months agoMerge "Refactor Networkmodel PortMappingListener"
Gilles Thouenon [Mon, 25 Mar 2024 11:34:21 +0000 (11:34 +0000)]
Merge "Refactor Networkmodel PortMappingListener"

7 months agoSH slight clean-up after Ca bump 46/110846/3
guillaume.lambert [Mon, 18 Mar 2024 14:42:24 +0000 (15:42 +0100)]
SH slight clean-up after Ca bump

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

7 months agoRefactor nbinotifications 19/110719/6
guillaume.lambert [Wed, 13 Mar 2024 16:47:09 +0000 (17:47 +0100)]
Refactor nbinotifications

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

7 months agoRefactor a few renderer RPCs 22/110822/7
guillaume.lambert [Sun, 17 Mar 2024 21:13:40 +0000 (22:13 +0100)]
Refactor a few renderer RPCs

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

7 months agoRefactor Networkmodel PortMappingListener 21/110821/7
guillaume.lambert [Sun, 17 Mar 2024 20:53:38 +0000 (21:53 +0100)]
Refactor Networkmodel PortMappingListener

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

7 months agoBump kafka-client version to 3.7.0 59/110959/2
Gilles Thouenon [Thu, 21 Mar 2024 10:36:07 +0000 (11:36 +0100)]
Bump kafka-client version to 3.7.0

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

7 months agoMigrate tapi notification functional tests to 2.4 48/110948/2
Gilles Thouenon [Thu, 21 Mar 2024 10:25:13 +0000 (11:25 +0100)]
Migrate tapi notification functional tests to 2.4

- fix NPE issue in CreateConnectivityServiceValidation when the request
does not contain any topology constraints
- TAPI notification functional test suite had been forgotten in the TAPI
migration to new models in v2.4. Adapt these tests to the new
implementation.

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

7 months agoFix bugs in nbinotifications module 47/110947/2
Gilles Thouenon [Thu, 21 Mar 2024 10:23:56 +0000 (11:23 +0100)]
Fix bugs in nbinotifications module

- fix NPE issue in NbiNotificationsHandler
- fix message issue in PceNotificationHandler of service handler
- add small delay in functional test execution to let the notification
being sent in kafka broker
- fix issue when uninstalling the feature (publisher sessions with
kafka server remained open)

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

7 months agoFix karaf client issue in functional test library 46/110946/1
Gilles Thouenon [Thu, 21 Mar 2024 10:07:38 +0000 (11:07 +0100)]
Fix karaf client issue in functional test library

- Remove logout from the bash command sent with subprocess run to avoid
having a runtime exception in karaf when we install the
odl-transportpce-nbinotifications feature
- remove an useless variable in sims_update_cp_port_ntcf method

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

7 months agoBump netconf to version 7.0.3 01/110901/1
Gilles Thouenon [Wed, 20 Mar 2024 08:02:59 +0000 (09:02 +0100)]
Bump netconf to version 7.0.3

Use latest netconf version to pick few fixes.

JIRA: TRNSPRTPCE-782
Change-Id: Ib0d870c1c8d65da4878851afc955415df64144b4
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
7 months agoBump grizzly-http-server version to 4.0.2 78/110878/1
Gilles Thouenon [Tue, 19 Mar 2024 17:14:04 +0000 (18:14 +0100)]
Bump grizzly-http-server version to 4.0.2

Instead of an old and unsecured 2.4.0 version.

JIRA: TRNSPRTPCE-789
Change-Id: Ia99c42f013e1c7415fbce0973795ddc8fb2095d6
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
7 months agoReplace javax.activation-api by the jakarta one 77/110877/1
Gilles Thouenon [Tue, 19 Mar 2024 16:39:35 +0000 (17:39 +0100)]
Replace javax.activation-api by the jakarta one

Remove the fixed and old version of javax.activation-api for the benefit
of the jakarta.activation-api provided by odlparent.

JIRA: TRNSPRTPCE-789
Change-Id: I3a22c3207c72f8efacde0654c3005b676b478763
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
7 months agoMerge changes I6014d5f7,I88b072fa
Gilles Thouenon [Tue, 19 Mar 2024 16:43:03 +0000 (16:43 +0000)]
Merge changes I6014d5f7,I88b072fa

* changes:
  Refine the RPC implementation registration
  Bump upstream dependencies to latest Ca versions

7 months agoRefine the RPC implementation registration 49/110849/2
Gilles Thouenon [Mon, 18 Mar 2024 17:45:32 +0000 (18:45 +0100)]
Refine the RPC implementation registration

- Replace the ClassToInstanceMap argument by a plain varargs with the
RPC implementations when registering RPC to
mdsal.binding.api.RpcProviderService.
- Optimize code by removing classes that have now become almost useless
- adapt the JUnit tests to check exactly which RPC impl are registered

JIRA: TRNSPRTPCE-788
Change-Id: I6014d5f7a4d0447a14ddcac59de6b1d9539677fb
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
7 months agoBump upstream dependencies to latest Ca versions 43/110743/2
Gilles Thouenon [Fri, 15 Mar 2024 07:34:13 +0000 (08:34 +0100)]
Bump upstream dependencies to latest Ca versions

Adopt:
- odlparent-13.0.11
- yangtools-13.0.2
- mdsal-13.0.1
- netconf-7.0.2

JIRA: TRNSPRTPCE-782
Change-Id: I88b072fa5abb6c020da743429777f1f2c96075f0
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
8 months agoFix inventory listeners code style 18/110718/3
guillaume.lambert [Wed, 13 Mar 2024 16:01:00 +0000 (17:01 +0100)]
Fix inventory listeners code style

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