transportpce.git
3 years agoMerge "Revert "Make AbstractTest as static class"" into stable/magnesium stable/magnesium
Guillaume Lambert [Thu, 12 Nov 2020 10:16:35 +0000 (10:16 +0000)]
Merge "Revert "Make AbstractTest as static class"" into stable/magnesium

3 years agoRevert "Make AbstractTest as static class" 51/93651/1
Guillaume Lambert [Thu, 12 Nov 2020 08:03:16 +0000 (08:03 +0000)]
Revert "Make AbstractTest as static class"

This reverts commit 734fe3cea3ae9e1de8530ccebeb84525b6bbb2c0.

Reason for revert: UT failure on the gate

Change-Id: I7c61c9a4b11f4cc6e82c2295f5792af839e5fcd5

3 years agoFix a method name typo in tapi module 70/93770/1
Gilles Thouenon [Tue, 10 Nov 2020 19:55:42 +0000 (20:55 +0100)]
Fix a method name typo in tapi module

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

3 years agoMake AbstractTest as static class 69/93769/1
Gilles Thouenon [Tue, 20 Oct 2020 16:01:54 +0000 (18:01 +0200)]
Make AbstractTest as static class

Adapt AbstractTest to allow use of @BeforeClass for TAPI UT improvements

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I5f25e7ccf2d781f18822a6a7884030ed97abe9f3
(cherry picked from commit 4ab08e4fda7f45c3fde791d0d7559b4083c9a6b0)

3 years agoPrecise Charsets in FileReader() methods 68/93768/1
manuedelf [Tue, 3 Nov 2020 09:02:44 +0000 (10:02 +0100)]
Precise Charsets in FileReader() methods

This is strongly advised and will be enforced after Silicon migration
and its switch to maven-modernizer-plugin.

JIRA: TRNSPRTPCE-345
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8f432106cee8a117979bd40e2b889d563ae44fb3
(cherry picked from commit 4ffe60da9b0625a9399fcedc60019a1d68656ae8)

3 years agoadd a healthcheck to lighty startup in func tests 67/93767/1
guillaume.lambert [Fri, 30 Oct 2020 14:00:49 +0000 (15:00 +0100)]
add a healthcheck to lighty startup in func tests

JIRA: TRNSPRTPCE-294
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3267de8fde9eb9e1a34f51eb6cb3f7584873cbfa
(cherry picked from commit 93d42311876be9f4b03997fd2dd782f7893e45e3)

3 years agoforce lighty use in tox 66/93766/1
guillaume.lambert [Fri, 30 Oct 2020 12:26:59 +0000 (13:26 +0100)]
force lighty use in tox

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

3 years agofix Lighty.io build 65/93765/1
guillaume.lambert [Wed, 30 Sep 2020 14:52:25 +0000 (16:52 +0200)]
fix Lighty.io build

- migrate to new lighty-core API
- migrate to new TPCE API

JIRA: TRNSPRTPCE-294
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id8906afd05ba7bee6468992d2d255b5db4b621e3
(cherry picked from commit 5e3675cf1ce1d119c758cb2d8513be591c1e6b78)

3 years agouse BOM in odl-transportpce feature pom 64/93764/1
guillaume.lambert [Fri, 16 Oct 2020 14:47:15 +0000 (16:47 +0200)]
use BOM in odl-transportpce feature pom

instead of specifying the right version each time

JIRA: TRNSPRTPCE-346
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I23c08594c6483d090d75f66f0c639528f22802ca
(cherry picked from commit a0136e44a34e87726e92f832a32cb343cf9393c4)

3 years agoremove odl-mdsal-broker useless dep from features 63/93763/1
manuedelf [Mon, 2 Nov 2020 13:35:14 +0000 (14:35 +0100)]
remove odl-mdsal-broker useless dep from features

Change-Id: I23fe0e3a66a1fd86034cc7268465af43296da4a1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 668b58f9c27bd47c81ed3d8ff21e0d301bc8cf05)

3 years agofix/rename transportpce-network-topology YANG file 62/93762/1
guillaume.lambert [Tue, 13 Oct 2020 13:58:55 +0000 (15:58 +0200)]
fix/rename transportpce-network-topology YANG file

The filename was inconsistent with its namespace and prefix i.e.
transportpce-topology and tpce-topology.

JIRA: TRNSPRTPCE-340
Change-Id: Ica44bef1026842de8258dbb77e69d37f3bd89716
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit d387a85da6807f60a1eace010ceeecff440a0512)

3 years agoClean up API YANG models with the help of pyang 61/93761/1
Balagangadhar Bathula [Wed, 7 Oct 2020 16:00:48 +0000 (12:00 -0400)]
Clean up API YANG models with the help of pyang

This addresses the following pyang generated warnings
 - Remove any unused imports
 - Add revision dates to the imports
 - Order the revisions
 - Fix a warning in org-openroadm-resource (MSA related)

JIRA: TRNSPRTPCE-340
Change-Id: I37dae25c3a54d5245a84b209b0f1f1981799fe5a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 722de361b95b7aa8c199b774653e67c78e661adb)

3 years agofix a bug in ServiceHandler ModelMappingUtil 60/93760/1
Balagangadhar Bathula [Wed, 7 Oct 2020 14:37:15 +0000 (10:37 -0400)]
fix a bug in ServiceHandler ModelMappingUtil

OTU, ODU and CLLI are wrongly assigned twice.

JIRA: TRNSPRTPCE-339
Change-Id: I3277d7d97bf43be2ddfd501d64d827107e84ce28
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit 6b2681f7128d84c1f602f6a3cdd0142e2bbec858)

3 years agoFix tpce internal Yang syntax 59/93759/1
manuedelf [Mon, 12 Oct 2020 12:36:26 +0000 (14:36 +0200)]
Fix tpce internal Yang syntax

- garbage/superflous "}" are no more tolerated by yangtools

JIRA: TRNSPRTPCE-336

Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I4d9ec5ffc20a9daca4487a3e783e0183b517fbe3
(cherry picked from commit bded2dfda7111cb9d1f263b06794319103dc5d90)
(cherry picked from commit d8045da824a1e5ede1ece4ea57d430efbf6dbd2a)

3 years agodo not explicit serialVersionUID anymore 58/93758/1
guillaume.lambert [Tue, 22 Sep 2020 08:11:12 +0000 (10:11 +0200)]
do not explicit serialVersionUID anymore

A new SpotBug rule has been introduced in odlparent Aluminium and
suggests to explicit the serialVersionUID in serializable classes to
avoid compilers interoperability problems due to a Java implementation
design flaw.

If this is useful in a few situations (rare today), this also means that
theorically developers must maintain this field and increment it across
classes incompatible versions.
Practically, this step is often forgotten, paving the way to more
serious problems.
Since the situation here does not require it, it is healthier to simply
ignore this (soon obsolete?) recommendation.

For more details:
git log pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID
https://moi.vonos.net/java/serialization-synthetic/
https://rules.sonarsource.com/java/RSPEC-4926
https://www.vojtechruzicka.com/explicitly-declare-serialversionuid/
https://www.infoworld.com/article/3275924/oracle-plans-to-dump-risky-java-serialization.html

JIRA: TRNSPRTPCE-292
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4e36134061104d912a75f3a578d43ca0bc17ab1f
(cherry picked from commit a00f3ee60b16735f27af765a5bf357c56a091bc5)

3 years agouse dict instead of many elif in functional tests 38/93738/2
guillaume.lambert [Wed, 9 Sep 2020 10:06:26 +0000 (12:06 +0200)]
use dict instead of many elif in functional tests

and add some forgotten tests in topology tests

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic0d0e00931527ecf421914fd3bf2048504758f49
(cherry picked from commit 868e64eafd77ca3e0238a41cb0c062fd777b9564)

3 years agoconvert test_topoPortmapping.py to snake case 37/93737/2
guillaume.lambert [Thu, 10 Sep 2020 09:46:42 +0000 (11:46 +0200)]
convert test_topoPortmapping.py to snake case

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I815871de4609c724cffe5f7ccdbcbfa3cab70de9
(cherry picked from commit 9ba30212c854491c400b3702d481013f5b262880)

3 years agoremove dead code from topology221 test 36/93736/2
guillaume.lambert [Thu, 10 Sep 2020 09:42:53 +0000 (11:42 +0200)]
remove dead code from topology221 test

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3657ce7a6af97b8043577c38cd579df352d32718
(cherry picked from commit f3259f5e419dea1bd0f295201c5c044ed1a6c951)

3 years agofix some pylint issues 35/93735/2
guillaume.lambert [Mon, 7 Sep 2020 14:44:51 +0000 (16:44 +0200)]
fix some pylint issues

and use a "#pylint disable=" comment to eliminate false positives

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4a741f9f30f6d8e2e2ea209ad44f936cdaf6150f
(cherry picked from commit 6fe500a1bf557eb44d22584ac6bf7c924f12c47f)

3 years agofix superflous parenthesis pointed out by pylint 34/93734/2
guillaume.lambert [Fri, 4 Sep 2020 14:25:42 +0000 (16:25 +0200)]
fix superflous parenthesis pointed out by pylint

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe23741d5a18814575cd05f1590d7c5ce0379c92
(cherry picked from commit 3492e0ddd262c793fa03b1fcd8738ba9cded6ea5)

3 years agofix functional tests linelength pylint issues 33/93733/2
guillaume.lambert [Fri, 4 Sep 2020 13:13:33 +0000 (15:13 +0200)]
fix functional tests linelength pylint issues

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4850052ec973fc799e956e1e4c5e817e8def4360
(cherry picked from commit 82ae34c05bd194c26ef4e30b2bdf1cf19093e19b)

3 years agofix few bugs and unused issues in functional tests 32/93732/2
guillaume.lambert [Fri, 4 Sep 2020 09:32:21 +0000 (11:32 +0200)]
fix few bugs and unused issues in functional tests

pointed out by pylint

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I37d95d2df919fd020fecf2750452442fb482ffb7
(cherry picked from commit 389574d637e154f75abb5244f50e0130b08e177c)

3 years agofix pylint configuration 31/93731/2
guillaume.lambert [Fri, 4 Sep 2020 08:52:02 +0000 (10:52 +0200)]
fix pylint configuration

- modify the method regex used:
  Tests methods name are commonly above the default limit of 32 char.
  They also use capital letters here to abide by the OpenROADM and WDM
  naming conventions.
- modify the variable regex used:
  It was supporting by default only the snake case and reported
  camel case variables as errors.
  Variable names also use capital letters here to abide by the OpenROADM
  and WDM naming conventions.
- disable the no-member check (inline):
  it reports many false positives since pylint is unable to retrieve
  the HTTP return codes given in the request package dictionary
- disable the too-many-public-methods check (inline):
  it reports many false positives since unittests requires many public
  methods

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I21686442628591fd2c4af5182dc9f438e5701cb2
(cherry picked from commit eb62dcae252d4ca82e7308b575c9babdbade868d)

3 years agofix test-common dependency scope in some pom files 30/93730/2
manuedelf [Mon, 21 Sep 2020 12:26:12 +0000 (14:26 +0200)]
fix test-common dependency scope in some pom files

JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I792c0e765b8b7f460ee77d5e51297f1d76e575ff
(cherry picked from commit 20f714ddd2e0bb1d4b23aad6398c2767e28d991c)

3 years agoimprove OTN renderer functional test 29/93729/2
guillaume.lambert [Tue, 25 Aug 2020 13:09:32 +0000 (15:09 +0200)]
improve OTN renderer functional test

port-types listed in supported-interface-capability are not ordered.
Thus, all possible order must be supported.

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iadec827ba5fff1c8b462f5add104d543a40c734f
(cherry picked from commit 53c5b508d518a7d5ce972f5e96723558523a964a)

3 years agoadd a path computation request method in functests 28/93728/2
guillaume.lambert [Wed, 12 Aug 2020 22:29:16 +0000 (00:29 +0200)]
add a path computation request method in functests

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

3 years agouse service deletion method in OTN E2E functest 27/93727/2
guillaume.lambert [Thu, 13 Aug 2020 07:34:12 +0000 (09:34 +0200)]
use service deletion method in OTN E2E functest

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

3 years agoadd unit tests for crossconnect package 26/93726/2
AhmedEldeeb50 [Mon, 6 Jul 2020 15:59:32 +0000 (17:59 +0200)]
add unit tests for crossconnect package

JIRA: TRNSPRTPCE-276

Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: I4b2048c9272322bcc48b950f4db11afeb82494f8
(cherry picked from commit 7a6def422ca9048a794b946da9217a74c0242f7d)

3 years agorationalize service deletion in E2E functests 25/93725/2
guillaume.lambert [Wed, 12 Aug 2020 10:28:14 +0000 (12:28 +0200)]
rationalize service deletion in E2E functests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I55c75329eb599ad8f525641d5eb694f6e42843d8
(cherry picked from commit 64975190383a3682d35b8e434b8be43606f1f81a)

3 years agofix new methods forgotten calls in func tests 24/93724/2
guillaume.lambert [Wed, 12 Aug 2020 09:08:56 +0000 (11:08 +0200)]
fix new methods forgotten calls in func tests

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

3 years agorationalize functional tests calls to service-path 23/93723/2
guillaume.lambert [Tue, 11 Aug 2020 08:27:31 +0000 (10:27 +0200)]
rationalize functional tests calls to service-path

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

3 years agorationalize service creation vars in E2E functests 22/93722/2
guillaume.lambert [Fri, 24 Jul 2020 12:17:41 +0000 (14:17 +0200)]
rationalize service creation vars in E2E functests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id904afaee15d1375dd806555fdc431e2092f6ae6
(cherry picked from commit 78441ef64aae46fc7a050bbe0c1b85ddb7b16123)

3 years agoUpdate honeynode simulator version 39/93739/1
manuedelf [Fri, 31 Jul 2020 10:50:45 +0000 (12:50 +0200)]
Update honeynode simulator version

For device 2.2.1 in order to manage flex-grid parameters

Change-Id: Iecaf0634821553e8dde77672bd640e1d28f0bbcc
(cherry picked from commit 8450c7d0372e20bbe2ddbd56079d8cfa29319767)

3 years agoAdd INFO.yaml for transportPCE 21/93721/1
Anil Belur [Sun, 12 Jul 2020 02:57:29 +0000 (12:57 +1000)]
Add INFO.yaml for transportPCE

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I28b0da67d7dcdd54345c673dda9979834c8d1d6d
(cherry picked from commit 31645f94dcf682c425217482adc8f70808de71d3)

3 years agoadd methods to manage service list in func tests 20/93720/1
guillaume.lambert [Thu, 16 Jul 2020 12:50:07 +0000 (14:50 +0200)]
add methods to manage service list in func tests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3348586596dd26ccf5ccf286029af326704a0954
(cherry picked from commit 764a00cec0dd3a9b04701a009cfd9728493a9a73)

3 years agoBump project version to 1.3.0 (Mg SR3) 66/92366/2
guillaume.lambert [Wed, 2 Sep 2020 08:34:35 +0000 (10:34 +0200)]
Bump project version to 1.3.0 (Mg SR3)

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

3 years agoBump dependencies to Mg SR3 dev versions 68/92268/1
guillaume.lambert [Mon, 31 Aug 2020 07:59:15 +0000 (09:59 +0200)]
Bump dependencies to Mg SR3 dev versions

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I08f8f327084ad5849d2231f4957d5d56a9b281fc
(cherry picked from commit 1fda790c4274118731f619a4d8dce3587283b8a2)

3 years agoUpdate MgSR2 kernel dependencies 75/91675/1
Gilles Thouenon [Mon, 27 Jul 2020 08:14:36 +0000 (10:14 +0200)]
Update MgSR2 kernel dependencies

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

3 years agoMissing modulation format for 2.2.1 OCH interface 74/91474/1
Balagangadhar Bathula [Tue, 14 Jul 2020 05:00:37 +0000 (01:00 -0400)]
Missing modulation format for 2.2.1 OCH interface

- Modified the OCH builder for 2.2.1
- Modified the test-suites

JIRA: TRNSPRTPCE-288
Change-Id: If2411fb08c358b65c6af11fdc4684daff92ac111
(cherry picked from commit 0c434e8a2ef64abd67905b03ba58d7614523ae5d)

3 years agofix E2E 2.2.1 tox profile 73/91473/1
guillaume.lambert [Thu, 23 Jul 2020 09:40:09 +0000 (11:40 +0200)]
fix E2E 2.2.1 tox profile

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

3 years agoadd a portmapping method in func tests 27/91527/2
guillaume.lambert [Sat, 11 Jul 2020 09:01:13 +0000 (11:01 +0200)]
add a portmapping method in func tests

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

3 years agoadd a method to manage otn topo in func tests 26/91526/2
guillaume.lambert [Fri, 10 Jul 2020 15:27:13 +0000 (17:27 +0200)]
add a method to manage otn topo in func tests

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

3 years agoadd a method to manage ordm network in func tests 25/91525/2
guillaume.lambert [Fri, 10 Jul 2020 14:25:55 +0000 (16:25 +0200)]
add a method to manage ordm network in func tests

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

3 years agoadd methods to manage clli network in func tests 69/91469/2
guillaume.lambert [Fri, 10 Jul 2020 13:30:25 +0000 (15:30 +0200)]
add methods to manage clli network in func tests

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

3 years agoUpdate kernel dependencies 43/91543/1
Gilles Thouenon [Wed, 22 Jul 2020 15:29:58 +0000 (17:29 +0200)]
Update kernel dependencies

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

3 years agoFix otn-link update issue 44/91444/1
Gilles Thouenon [Mon, 20 Jul 2020 11:15:56 +0000 (13:15 +0200)]
Fix otn-link update issue

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

3 years agoUpdate MgSR2 documentation for OTN part 46/91346/2
Gilles Thouenon [Thu, 16 Jul 2020 09:40:24 +0000 (11:40 +0200)]
Update MgSR2 documentation for OTN part

JIRA: TRNSPRTPCE-289
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ie890eecdd9eb3f8c11dfe444986b7e2b12095d60

3 years agoDo not fail on warnings for docs-linkcheck 06/91206/2
Thanh Ha [Fri, 10 Jul 2020 14:11:36 +0000 (10:11 -0400)]
Do not fail on warnings for docs-linkcheck

This is a workaround due to sphinx-tabs being incompatible with the
Sphinx linkchecker which throws a warning. We mainly use linkchecker
to catch broken links so we don't really need to fail on warnings as
the main "docs" builder will still fail for warning level issues so
this is a reasonable workaround.

Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I545f7cfaea27f907c13b5c21af26f1ee4b7d1b62

3 years agoactivate otn E2E tests in releng 84/91184/2
guillaume.lambert [Thu, 9 Jul 2020 21:40:12 +0000 (23:40 +0200)]
activate otn E2E tests in releng

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

3 years agoUpdate to Mg SR2 kernel dependencies 10/91210/1
Gilles Thouenon [Fri, 10 Jul 2020 15:41:02 +0000 (17:41 +0200)]
Update to Mg SR2 kernel dependencies

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

3 years agoFix javadoc issue 86/91086/2
Gilles Thouenon [Fri, 10 Jul 2020 10:23:40 +0000 (12:23 +0200)]
Fix javadoc issue

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

3 years agoFunctional tests for end-to-end otn services 83/91183/1
Gilles Thouenon [Wed, 8 Jul 2020 15:59:15 +0000 (17:59 +0200)]
Functional tests for end-to-end otn services

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I10f3ac24a4a13bd6426afb9f0c396fe806a06464

3 years agoadd methods to manage ordm topo in func tests 82/91182/1
guillaume.lambert [Thu, 9 Jul 2020 13:52:05 +0000 (15:52 +0200)]
add methods to manage ordm topo in func tests

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

3 years agoforce releng tox docs-linkcheck to success 81/91181/1
guillaume.lambert [Thu, 9 Jul 2020 20:24:07 +0000 (22:24 +0200)]
force releng tox docs-linkcheck to success

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

3 years agoSimplify spdrA configuration management in tests 80/91180/1
Gilles Thouenon [Tue, 7 Jul 2020 13:03:10 +0000 (15:03 +0200)]
Simplify spdrA configuration management in tests

Keep only one configuration (without existing interfaces) for SPDRA,
given the fact that interfaces may now be easily created by
TransportPCE.

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I65ba30a1f960f6ad9400a2ac925af69795b0ceba

3 years agoadd a method to get nodes oper DS in func tests 79/91179/1
guillaume.lambert [Wed, 8 Jul 2020 13:06:42 +0000 (15:06 +0200)]
add a method to get nodes oper DS in func tests

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

3 years agoadd a method to check nodes configs in func tests 78/91178/1
guillaume.lambert [Tue, 7 Jul 2020 15:09:11 +0000 (17:09 +0200)]
add a method to check nodes configs in func tests

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

3 years agoFix service-name in otn-renderer FuncTest 77/91177/1
Gilles Thouenon [Tue, 7 Jul 2020 08:58:21 +0000 (10:58 +0200)]
Fix service-name in otn-renderer FuncTest

Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I31b447faf8153619dea383aa7ca72f092927be57

3 years agoIntegration of end-to-end otn services 76/91176/1
Gilles Thouenon [Thu, 2 Jul 2020 06:55:17 +0000 (08:55 +0200)]
Integration of end-to-end otn services

-allow creation and deletion of new WDM service (OCH-OTU4) and OTN
services (HO-ODU4, 10GE/1GE) from Service Handler
-complements changes 87920 and 90616 with deletion of otn services
-for 10GE and 1GE services, use trib-port and trib-slot numbers provided
by PCE computation
-for service deletion, retreive and introduce the service header
description in order to distinguish the type of otn service to delete
and adapt its deletion consequently
-adapt Junit tests consequently

JIRA: TRNSPRTPCE-165, TRNSPRTPCE-194
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I83da87a0c61eb32c9ab023ad614adc79caa3ed75

3 years agoAdapt PCE output to include trib-port & trib-slot 75/91175/1
Gilles Thouenon [Thu, 2 Jul 2020 06:51:40 +0000 (08:51 +0200)]
Adapt PCE output to include trib-port & trib-slot

JIRA: TRNSPRTPCE-164
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I170e12e07f16a0f7b0e7a61d79e976b78e64e705

3 years agoUpgrade path-description model to 1.6.1 for otn 74/91174/1
Gilles Thouenon [Mon, 29 Jun 2020 09:11:07 +0000 (11:11 +0200)]
Upgrade path-description model to 1.6.1 for otn

- remove mandatory attribute for wavelength number (useful only for
OCH-OTU4 services)
- add trib-port and trib-slot number attributes for otn low order
services

JIRA: TRNSPRTPCE-164
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I495ebacc5341b0cb3067f74e1c5e8f65602cf93a

3 years agoadapt functional tests to SH-Renderer new OTN API 73/91173/1
Balagangadhar Bathula [Fri, 12 Jun 2020 22:33:04 +0000 (00:33 +0200)]
adapt functional tests to SH-Renderer new OTN API

 - New tests for validating WDM/OTN service
 - Renderer service implementation tests
 - update docker source profile

TODO:
 - Tests for service delete (depends on OTN tpce?)

JIRA: TRNSPRTPCE-194
Change-Id: I88b6961f2e4bf7732358d420576cbf29dff8b402

3 years agodo not start tests if sample files cannot be read 72/91172/1
guillaume.lambert [Mon, 29 Jun 2020 08:48:08 +0000 (10:48 +0200)]
do not start tests if sample files cannot be read

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

3 years agoenable OTN topology func test in releng 71/91171/1
guillaume.lambert [Mon, 29 Jun 2020 08:02:30 +0000 (10:02 +0200)]
enable OTN topology func test in releng

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

3 years agogeneralize RESTconf requests methods in func tests 70/91170/1
guillaume.lambert [Fri, 26 Jun 2020 19:18:36 +0000 (21:18 +0200)]
generalize RESTconf requests methods in func tests

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

3 years agoreview SPDR sims nomenclature 69/91169/1
guillaume.lambert [Sat, 27 Jun 2020 10:03:27 +0000 (12:03 +0200)]
review SPDR sims nomenclature

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

3 years agofix networkmodel tests portMapping.json 68/91168/1
guillaume.lambert [Fri, 26 Jun 2020 11:47:51 +0000 (13:47 +0200)]
fix networkmodel tests portMapping.json

- for hash values based on FNV

Co-authored-by: Balagangadhar Bathula <bb4341@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I112d3f11eee0f5bb273bf8089673272d0f9ac089

3 years agofix some tapi functional tests issues 67/91167/1
guillaume.lambert [Fri, 26 Jun 2020 17:42:03 +0000 (19:42 +0200)]
fix some tapi functional tests issues

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

3 years agoreactivate E2E tests vote in jenkins 66/91166/1
guillaume.lambert [Fri, 26 Jun 2020 11:38:09 +0000 (13:38 +0200)]
reactivate E2E tests vote in jenkins

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

3 years agodisable failfast in rspn tests 65/91165/1
guillaume.lambert [Thu, 25 Jun 2020 22:49:06 +0000 (00:49 +0200)]
disable failfast in rspn tests

Otherwise, devices are not cleanly unmounted in case of tests failure

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

3 years agoreplace 'tail -F' by python portable code in tests 64/91164/1
guillaume.lambert [Thu, 25 Jun 2020 23:12:03 +0000 (01:12 +0200)]
replace 'tail -F' by python portable code in tests

- wait for log file creation if needed
- use classical open/fseek/readlines/close built-in file handlers

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

3 years agoSH-Renderer API code to handle OTN Step 2 63/91163/1
Balagangadhar Bathula [Wed, 19 Feb 2020 22:04:55 +0000 (17:04 -0500)]
SH-Renderer API code to handle OTN Step 2

- improve ODU4 support
- Fixing connection-type issue for roadmline

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

3 years agoclean common/pom.xml 62/91162/1
guillaume.lambert [Thu, 25 Jun 2020 21:33:35 +0000 (23:33 +0200)]
clean common/pom.xml

to unforce Junit tests execution

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

3 years agosome tests for PortMappingVersion121 61/91161/1
Abdelmuhaimen Seaudi [Tue, 9 Jun 2020 20:48:27 +0000 (22:48 +0200)]
some tests for PortMappingVersion121

JIRA: TRNSPRTPCE-276
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I9d071fbfd1495942f7234908b998df87ce483c3a

3 years agoSome tests for transportpce-common 60/91160/1
Abdelmuhaimen Seaudi [Fri, 5 Jun 2020 15:43:49 +0000 (17:43 +0200)]
Some tests for transportpce-common

add test-common dependancy in pom.xml file

JIRA: TRNSPRTPCE-276
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I0534886a9aae432a3e8ee6d7d56779bf4f686a32

3 years agoimprove pce unit tests 59/91159/1
AhmedEldeeb50 [Wed, 10 Jun 2020 08:20:43 +0000 (10:20 +0200)]
improve pce unit tests

-add some helper methods at NetworkTransactionUtil
-add try with resource for IO
-add a message to assert(True/False)

JIRA: TRNSPRTPCE-209
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: I721b6c3bf472a299cd3016929d4af2e99bd6bb5e

3 years agoAdd NetConfTopologyListenerTest 58/91158/1
Abdelmuhaimen Seaudi [Sat, 30 May 2020 22:06:18 +0000 (15:06 -0700)]
Add NetConfTopologyListenerTest

JIRA: TRNSPRTPCE-270
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I142a58243b7f58f4f7d19fe664f841a11a9189ad

3 years agoreview tox.ini E2E tests sequence 57/91157/1
guillaume.lambert [Wed, 24 Jun 2020 13:35:56 +0000 (15:35 +0200)]
review tox.ini E2E tests sequence

- pull all end-to-end 1.2.1 or 2.2.1 tests at the end
- make them non-voting

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

3 years agoSH-Renderer API code to handle OTN Step 1 56/91156/1
Balagangadhar Bathula [Wed, 19 Feb 2020 22:04:55 +0000 (17:04 -0500)]
SH-Renderer API code to handle OTN Step 1

  - Added otn-service-path method in SH model-mapping
  - Updated renderer to differenciate WDM and OTN service.
  - Updated service-path-path with connection type.
  - Updated the ODU4/OTU4 renderer input create
  - Fixed unit tests

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

3 years agoupgrade transportpce-renderer YANG to 1.6.1 55/91155/1
Balagangadhar Bathula [Fri, 12 Jun 2020 21:01:22 +0000 (23:01 +0200)]
upgrade transportpce-renderer YANG to 1.6.1

 - to add a leaf connection-type that improves the OTN support
 - and modify import statements accordingly

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

3 years agoreplace portmapping FNV1-128 by FNV1-64 + Base64 54/91154/1
guillaume.lambert [Tue, 23 Jun 2020 14:14:31 +0000 (16:14 +0200)]
replace portmapping FNV1-128 by FNV1-64 + Base64

FNV1 128bit hash produces 16 bytes results but they cannot easily be
represented as a UTF-8 readable string of 16 characters as required
by SAPI/DAPI OpenROADM specification.
Base64 conversion allows to fix this but generates an overhead.
By using FNV1 64bit hash + Base64, we can guarantee the results
will not exceed 16 characters (usually around 13).

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

3 years agofix Lighty build 53/91153/1
guillaume.lambert [Tue, 23 Jun 2020 20:01:03 +0000 (22:01 +0200)]
fix Lighty build

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

3 years agoreactivate E2E functional tests in the gate 52/91152/1
guillaume.lambert [Tue, 23 Jun 2020 07:41:56 +0000 (09:41 +0200)]
reactivate E2E functional tests in the gate

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

3 years agofix some pylint issues 51/91151/1
guillaume.lambert [Mon, 22 Jun 2020 22:55:11 +0000 (00:55 +0200)]
fix some pylint issues

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

3 years agoimprove devices connection methods in tests 50/91150/1
guillaume.lambert [Mon, 22 Jun 2020 08:22:23 +0000 (10:22 +0200)]
improve devices connection methods in tests

- improve log parser output
- move some constants to common/test_utils:
  - RESTconf base URL
  - ODL and nodes credentials
  - json and XML application-type headers
- improve functions to mount or unmount devices onto ODL
- centralize them in common/test_utils to use the same ones in all tests
  and speed up tests by removing some timers

TODO in next other changes:
- use test_utils get/post/del/put_requests methods in all tests
- replace the other timers with the log parser
- find an alternative to calling 'tail -f' host command
- address pylint issues

Change-Id: I2b97700e363a3773dcc1606448eedae57c8c6696
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
3 years agoAlign 1.2.1 tests sims/tpce management to 2.2.1 49/91149/1
guillaume.lambert [Thu, 18 Jun 2020 10:43:04 +0000 (12:43 +0200)]
Align 1.2.1 tests sims/tpce management to 2.2.1

- move 2.2.1 test_utils.py to a common folder
  to make it resuable in 1.2.1 tests
- create 2 simulators.py files with version specific parameters
  to import them in test_utils
- use symlinks to by pass python relative import beyond top-level issues
- adapt functional tests code accordingly

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

3 years agoreview sims/tpce process management in 2.2.1 tests 48/91148/1
guillaume.lambert [Wed, 17 Jun 2020 22:07:51 +0000 (00:07 +0200)]
review sims/tpce process management in 2.2.1 tests

Change-Id: I441312ada9b10f498d86fcb1fd6fda0aa0be4d3f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
3 years agofix topology files relative paths in PCE functest 47/91147/1
guillaume.lambert [Fri, 19 Jun 2020 14:56:48 +0000 (16:56 +0200)]
fix topology files relative paths in PCE functest

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

3 years agominor changes in functional tests 46/91146/1
Balagangadhar Bathula [Sun, 14 Jun 2020 02:58:07 +0000 (22:58 -0400)]
minor changes in functional tests

- Tox is added with env variables for network proxy setting
- Changed the default timeout value in test_utils.py 221
- fix tox.ini BSD sed
- comment this solution with the details of the backslash hell
  generated by tox

Change-Id: Ib6c4da9dac80705344038d199a7372795461a6dc

3 years agoUpdate honeynode simulator version 45/91145/1
manuedelf [Fri, 19 Jun 2020 20:23:44 +0000 (22:23 +0200)]
Update honeynode simulator version

New version following bux fix "Make honeycomb-tpce script BSD compatible"

Change-Id: If259f0d24924b86a55da0aeb655ce6b13ffb0685

3 years agoadd unit tests for pceOtnNode 44/91144/1
ShaabanEltanany [Sun, 31 May 2020 10:56:32 +0000 (12:56 +0200)]
add unit tests for pceOtnNode

JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I84db3039341163441d3bf05cf0741e3efb32a9e1

3 years agoCatch port-mapping failing 43/91143/1
Balagangadhar Bathula [Wed, 10 Jun 2020 14:57:43 +0000 (10:57 -0400)]
Catch port-mapping failing

When the xponder subtree has missing circuit-packs/ports,
skip those missing circuit-packs/ports and continue port-mapping.

Change-Id: I33e53c9b9d5981564986593d87fa1532d5b06edb

3 years agoPower Control for Flex-grid 42/91142/1
shweta [Mon, 15 Jun 2020 19:09:32 +0000 (15:09 -0400)]
Power Control for Flex-grid

1) Updated olm-renderer-input to have central-freq and width
2) Changed revision for transportpce-common-types
3) Added PSD power calculation in PowerMgmtImpl

TRNSPRTPCE-254
Signed-off-by: shweta <sv111y@att.com>
Change-Id: I7f0ace1e0d88e9840a401108e15787d8e8d81942

3 years agoadding some unit tests for PceServiceRPCImpl 41/91141/1
ShaabanEltanany [Tue, 2 Jun 2020 04:47:13 +0000 (06:47 +0200)]
adding some unit tests for PceServiceRPCImpl

JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I2bfab3053f865191e9e03b588666669e7b08f821

3 years agoUpdate honeynode simulator version 40/91140/1
manuedelf [Wed, 17 Jun 2020 17:47:39 +0000 (19:47 +0200)]
Update honeynode simulator version

New version following bug fix when deleting interface for 2.2.1 devices.

Change-Id: Ib843b4092a0bdcb9f55544c1b719c522833d0d0e

3 years agoreview sims/tpce start-up sequence in 2.2.1 tests 39/91139/1
guillaume.lambert [Wed, 17 Jun 2020 09:32:12 +0000 (11:32 +0200)]
review sims/tpce start-up sequence in 2.2.1 tests

and make tests fail immediately when tpce does not start correctly

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

3 years agorationalize functional tests sims starters 38/91138/1
guillaume.lambert [Mon, 15 Jun 2020 11:05:16 +0000 (13:05 +0200)]
rationalize functional tests sims starters

in test_utils.py:
- centralize sims ports and config/log files in one associative array
- based on this, use one method start_sim(sim) for every sims
- remove obsolete dedicated-per-sim methods
- centralize messages printed at sims and tpce start-up

in tests files
- replace harcoded port values by the corresponding array value
- replace the term "honeynode" by "sim" which is more generic
- remove obsolete sims timers in 2.2.1 tests

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

3 years agofix assertDictContainsSubset deprecation warnings 37/91137/1
guillaume.lambert [Tue, 16 Jun 2020 07:56:08 +0000 (09:56 +0200)]
fix assertDictContainsSubset deprecation warnings

that appeared in functional tests with python 3.2

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

3 years agoUUID stabilization in TAPI Topology abstraction 36/91136/1
Gilles Thouenon [Sat, 13 Jun 2020 14:24:02 +0000 (16:24 +0200)]
UUID stabilization in TAPI Topology abstraction

- make UUID generation deterministics instead of being randomly generated
- update existing JUnit tests taking into acount this evolution
- add new JUnit test to validate the TAPI abstraction for OTN topology

TRNSPRTPCE-186
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ia8541282799c10c5de0ad4bb263eb33ec6eb87a1

3 years agoImprove OpenRoadmOtnTopology and add Junit tests 35/91135/1
Gilles Thouenon [Fri, 5 Jun 2020 10:28:11 +0000 (12:28 +0200)]
Improve OpenRoadmOtnTopology and add Junit tests

JIRA: TRNSPRTPCE-270
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I6c1347daa149adce1130c9ccf01b05d7e874ff14