transportpce.git
5 years agoclean api pom 87/81687/1 testing
guillaume.lambert [Wed, 17 Apr 2019 14:54:11 +0000 (16:54 +0200)]
clean api pom

Change-Id: I57fc668daf8acbda5df718d1afab433663c46ab8
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump to Fluorine SR3 dev dependencies 85/81685/1
guillaume.lambert [Mon, 18 Mar 2019 14:36:36 +0000 (15:36 +0100)]
Bump to Fluorine SR3 dev dependencies

Change-Id: I758d352facd8fe1913ec5b88be0a5f796f7628a0
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoService-restoration implementation 59/79959/7
Martial COULIBALY [Mon, 28 Jan 2019 17:27:37 +0000 (18:27 +0100)]
Service-restoration implementation

First implementation of service-restoration rpc according to
openroadm-service documentation.

Change-Id: I6a8687b088c2e1fcb2d0d747ce46dd94f0ddc25e
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoreintroduce SP 1.6 in SH 84/79884/7
Martial COULIBALY [Thu, 24 Jan 2019 15:29:21 +0000 (16:29 +0100)]
reintroduce SP 1.6 in SH

- Backport all changes to Service Path in the 1.6 version
(Added container in path-description resources).
- Add service-feasability-check rpc.
- Add service-reconfigure rpc.

JIRA: TRNSPRTPCE-44
Change-Id: Ibe6fc57115d2fd0c7dedc54211440727b288f7ed
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoService-notification handling for serviceHandler 18/78218/33
Martial COULIBALY [Mon, 26 Nov 2018 16:19:10 +0000 (17:19 +0100)]
Service-notification handling for serviceHandler

- Modify RPC serviceCreate / serviceDelete/ serviceReroute
to add support for notifcation
- Add / Modify PCEListenerImpl and RendererListener class
to execute tasks after received notifications
- Modify SH provider to add notifcations listeners
for PCE and Renderer
- Add / Modify Junit Tests

JIRA: TRNSPRTPCE-50
JIRA: TRNSPRTPCE-71
Change-Id: I3000c7c7ed935dc51c7b68da5581b74445287024
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoService-notification handling for Renderer 92/78292/17
Martial COULIBALY [Thu, 29 Nov 2018 08:20:23 +0000 (09:20 +0100)]
Service-notification handling for Renderer

- Modify Renderer to send notifications to SH
- Modify Renderer service to implement RPCs ListenableFuture

JIRA: TRNSPRTPCE-50
Change-Id: I4ed3cc24814ac8c6ddf303d5fa3746de6389b7a5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoService-notification handling for PCE 91/78291/12
Martial COULIBALY [Thu, 29 Nov 2018 08:20:48 +0000 (09:20 +0100)]
Service-notification handling for PCE

- Modify PCE to send notifications to ServiceHandler
- Modify PCE to implement RPCs ListenableFuture

JIRA: TRNSPRTPCE-50
Change-Id: Ibc74ea8141284e545c44e87926acf49a150eac27
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoEnd-to-end functional tests 42/78542/9
Gilles Thouenon [Thu, 6 Dec 2018 08:46:42 +0000 (09:46 +0100)]
End-to-end functional tests

- adapt ROADM configuration files of honeynode with ots-oms interfaces
and SRG3
- adapt XPDR configuration files of honeynode with addition of Network2
port for XPDRC and bug correction in config of XPDRA
- add a new functional test suite that check the whole TransportPCE
modules  (with basic checks of renderer, topology, pce and service
handler for 'service' and 'roadm-line' connection-type)
- adapt tox.ini consequently
- bugs corrections on the end-to-end test suite

NB: with current version of TransportPCE code, some tests may fail:
- test_15 with test_17 and test_18
- test_16
- test_22 with test_23 and test_24
- test_47

Change-Id: I725e9021f3a6e8da768218de60882079c4c9ef6e
JIRA: TRNSPRTPCE-54
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agotrigger functional tests in jenkins 44/78544/29
guillaume.lambert [Fri, 7 Dec 2018 15:18:19 +0000 (16:18 +0100)]
trigger functional tests in jenkins

- merge tests/tox.ini with tox.ini by using setupdir variable.
  This way, functional tests can be launched from project root dir.
- adapt sphinx docs testenv consequently
- releng "tox-verify" macro does not bring any maven installation.
  Inside tox, check if mvn is present on the host system. If not,
  call a script to download and install it (yum package is obsolete).
- some tests are still expected to fail.
  forcing tox return codes to success.

JIRA: TRNSPRTPCE-14
Change-Id: I50db9e9894cc5792a0b63f3084bed157df41efe0
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump to odlparent 3.1.6 and yangtools 2.0.16 78/79878/1
guillaume.lambert [Thu, 24 Jan 2019 11:15:39 +0000 (12:15 +0100)]
Bump to odlparent 3.1.6 and yangtools 2.0.16

Change-Id: I992abf5412b128723a4ce764398e813072e2354a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump odlparent to 3.1.5 60/79060/4
Martial COULIBALY [Wed, 26 Dec 2018 09:52:49 +0000 (10:52 +0100)]
Bump odlparent to 3.1.5

Change-Id: I7db9b0b1043a81e55c8eb94693db07c7c8373160
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoFix testing dependency in olm/pom.xml 34/79534/2
Jonas MÃ¥rtensson [Tue, 15 Jan 2019 10:31:23 +0000 (11:31 +0100)]
Fix testing dependency in olm/pom.xml

Change-Id: Ia18a4a725e80bc88c7447d243b3d1f4a078e5776

5 years agofix javadoc warnings 41/78541/5
guillaume.lambert [Fri, 7 Dec 2018 14:07:51 +0000 (15:07 +0100)]
fix javadoc warnings

Change-Id: I5c2e5b9efe0db0a17708e5f5b90aa1aa7527ca72
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBug corrections in PCE 78/78378/10
Martial COULIBALY [Mon, 3 Dec 2018 13:19:36 +0000 (14:19 +0100)]
Bug corrections in PCE

Solve Bugs conerning PCE random selection on :
- ROADM-SRG node
- SRG-PP port

JIRA: TRNSPRTPCE-52
Change-Id: Ia04a62f419315239dab5170ffb874b58ab6224e5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agofix javadoc warnings 11/78411/4
guillaume.lambert [Tue, 4 Dec 2018 09:35:36 +0000 (10:35 +0100)]
fix javadoc warnings

Change-Id: If1c1a715e517ce9e431b0c693bebce3207982be8
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoUpdate stubRenderer 79/78379/4
Martial COULIBALY [Mon, 3 Dec 2018 14:37:40 +0000 (15:37 +0100)]
Update stubRenderer

Add NetworkModelWavelengthService to be able update
openraodm-topology especially the TPs used.

Change-Id: I743506baf4f621590e3257d76ca790129e56925c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBump TPCE dependencies 18/78318/1
guillaume.lambert [Thu, 29 Nov 2018 13:53:58 +0000 (14:53 +0100)]
Bump TPCE dependencies

Change-Id: I245f7915ce1f691359a273a5b7582b45d6814f5a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump to yangtools 2.0.13 04/78204/1
guillaume.lambert [Tue, 27 Nov 2018 09:57:10 +0000 (10:57 +0100)]
Bump to yangtools 2.0.13

Change-Id: I11b821a1b8182f5b6495048278f67b23813f6066
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoMerge "OLM unit testing update"
Guillaume Lambert [Mon, 26 Nov 2018 14:52:20 +0000 (14:52 +0000)]
Merge "OLM unit testing update"

5 years agoadded OSNR calculation logic into PCE 65/76665/6
shweta [Thu, 4 Oct 2018 21:50:56 +0000 (17:50 -0400)]
added OSNR calculation logic into PCE

JIRA: TRNSPRTPCE-51
Change-Id: I12c490d246c943dc5158c17e37911720d415c304
Signed-off-by: shweta <sv111y@att.com>
5 years agoOLM unit testing update 91/78091/2
doha.khaled [Thu, 22 Nov 2018 13:17:32 +0000 (15:17 +0200)]
OLM unit testing update

JIRA: TRNSPRTPCE-59
Change-Id: Ic513dd8d5e36fd35b436cd4d397d7f2eb80c8572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoSH RPC temp-service-create/delete 92/77992/6
Martial COULIBALY [Tue, 20 Nov 2018 16:34:31 +0000 (17:34 +0100)]
SH RPC temp-service-create/delete

Handle missing RPC in Service Handler :
- temporary-service-create
- temporary-service-delete

JIRA: TRNSPRTPCE-53
Change-Id: I2b00e4deb89777ebf4b7b0849852cfe89f029c9c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoCorrect topology test 01/77801/9
Martial COULIBALY [Wed, 14 Nov 2018 16:52:26 +0000 (17:52 +0100)]
Correct topology test

Modify topology tests to only test if XPONDER had at least 2 TPs:
- 1 XPONDER-CLIENT
- 1 XPONDER-NETWORK

JIRA: TRNSPRTPCE-34
Change-Id: Id2caff13818f13e17d830a23f6fa78dc3f6da7f3
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoROADM To ROADM Path Calculation on unidir ports 35/77935/8
Martial COULIBALY [Fri, 16 Nov 2018 16:11:03 +0000 (17:11 +0100)]
ROADM To ROADM Path Calculation on unidir ports

JIRA: TRNSPRTPCE-52
Change-Id: Ied8e96d96d52636c11325c2f2b2b6c8c2eebca6c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoinitial olm unit testing commit 49/77849/2
doha.khaled [Thu, 15 Nov 2018 06:14:30 +0000 (08:14 +0200)]
initial olm unit testing commit

JIRA: TRNSPRTPCE-59
Change-Id: I0bd11fa7df291891acab856e5e4b666b9b23caa9

5 years agoMerge "ROADM To ROADM Path Calculation"
Guillaume Lambert [Wed, 14 Nov 2018 10:15:25 +0000 (10:15 +0000)]
Merge "ROADM To ROADM Path Calculation"

5 years agoUpdate Functional tests for SP1.6 92/77692/3
Martial COULIBALY [Mon, 12 Nov 2018 16:04:23 +0000 (17:04 +0100)]
Update Functional tests for SP1.6

Change-Id: Ifd8df94c618dcb5d43cebf8ef1fcba5204c94c90
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoReintroduce SP 1.6 models in TPCE 24/77324/8
Martial COULIBALY [Fri, 21 Sep 2018 14:45:23 +0000 (16:45 +0200)]
Reintroduce SP 1.6 models in TPCE

JIIRA:TRNSPRTPCE-44
Change-Id: Ib3cb5d7e7efe8998de446db4d011ed6a3912bc68
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoROADM To ROADM Path Calculation 91/77691/1
Martial COULIBALY [Mon, 12 Nov 2018 15:54:17 +0000 (16:54 +0100)]
ROADM To ROADM Path Calculation

Add to the PCE the ability to calculate the path between two
ROADMs (from/to SRG-PP).

Change-Id: Ia796cb22fc7de0657bc5a09661c1f7aa2fcb6acb
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoReintroduce SP 1.6 models in API module 15/77315/8
Martial COULIBALY [Thu, 13 Sep 2018 15:09:22 +0000 (17:09 +0200)]
Reintroduce SP 1.6 models in API module

Rename all yang modules to be compliant with transportpce-*.yang

JIIRA:TRNSPRTPCE-44
Change-Id: I0018dbbad7a84ab2a185256356813337cc48bc94
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBump to yangtools 2.0.12 91/77491/1
Martial COULIBALY [Mon, 5 Nov 2018 08:49:46 +0000 (09:49 +0100)]
Bump to yangtools 2.0.12

Change-Id: I0214031cc909541f35b08d8453fd02c44a564bf6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBug correction in ServiceDatastore Operations 45/77345/2
Martial COULIBALY [Wed, 3 Oct 2018 09:10:39 +0000 (11:10 +0200)]
Bug correction in ServiceDatastore Operations

* modify mappingServices from ModelMappingUtils to not add container
topology in service datastore because RPC serviceImplementation not
returned this information. Otherwise Renderer module add this Topology
information in datastore.
* remove some bug in renderer ModelMappingUtils

Change-Id: I0280aabd5c9943030a27ec4cd27698413efc3d0d
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBump oldparent to 3.1.4 23/77323/2
Martial COULIBALY [Mon, 29 Oct 2018 15:13:38 +0000 (16:13 +0100)]
Bump oldparent to 3.1.4

Change-Id: I17497a22493ef1e2fee8735ad33927d1d06bc76e
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate OLM function tests 81/77181/1
Gilles Thouenon [Fri, 19 Oct 2018 15:35:33 +0000 (17:35 +0200)]
Update OLM function tests

- tests calculate-spanloss-base rpc with all links
- tests calculate-spanloss-current rpc

Change-Id: I0cf3cba86d92b478b9bf644a0ac222faf12253c9
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoOLM bug correction in rpc span-loss-current 80/77180/1
Gilles Thouenon [Fri, 19 Oct 2018 15:27:45 +0000 (17:27 +0200)]
OLM bug correction in rpc span-loss-current

- remove internal class which defined ROADM links
- bug correction in calculateSpanlossBase and calculateSpanlossCurrent
methods of OlmPowerServiceImpl class
- adapt olm yang model to return the list of roadm links with their
associated spanloss

Change-Id: I4c9477d873aad17791347a803b0d7f67f202ca0e
JIRA: TRNSPRTPCE-47
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoOLM functional Tests init 69/77169/1
Martial COULIBALY [Fri, 5 Oct 2018 14:55:57 +0000 (16:55 +0200)]
OLM functional Tests init

- complement functional test suite with additional checks
  - 'power' value of a roadm-connection
  - different cases according to presence or not of 'power-capabilities'
    in configuration node
- update initializing config files of nodes according to these tests

Change-Id: Ib3dd25ba3d9309023da2b91f76c719b35daa34ae
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoEnhance the createOtsOms RPC with a timer 68/77168/1
Martial COULIBALY [Fri, 5 Oct 2018 14:23:34 +0000 (16:23 +0200)]
Enhance the createOtsOms RPC with a timer

Modify the createOtsOms RPC to be able to wait 1min until the operation
'updatePortmapping' refreshes the supportedOts information in the
portmapping datastore.

Change-Id: I8ebdb52f528a65d8abd1843ead54959f9d65ca79
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoclean some compilation warnings 46/77146/1
guillaume.lambert [Mon, 3 Sep 2018 14:59:53 +0000 (16:59 +0200)]
clean some compilation warnings

- remove HiddenField warnings
- remove HideUtilityClassConstructor warnings
- remove Servicehandler private constructors call from Junit tests
- remove unused imports
- remove WhitespaceAround warnings

Change-Id: Ie71482b476b2b92e91f96df36463315bf935037b
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBug correction in topoPortMapping tests 45/77145/1
Martial COULIBALY [Wed, 10 Oct 2018 14:27:49 +0000 (16:27 +0200)]
Bug correction in topoPortMapping tests

Change-Id: I7942014db5149258a7718c653a4e80db2b132f49
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate testtool version to release/fluorine 44/77144/1
Martial COULIBALY [Tue, 9 Oct 2018 15:10:41 +0000 (17:10 +0200)]
Update testtool version to release/fluorine

Change-Id: Iad8ba2987c224bac0da0688c3b5a1aea4a0ae602
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoremove stubs bundles from build process 43/77143/1
guillaume.lambert [Mon, 17 Sep 2018 13:10:38 +0000 (15:10 +0200)]
remove stubs bundles from build process

move stubrenderer implementation to servicehandler test folder.

Change-Id: I8a284ea6445421aecbcd99a804274c5f20017e7d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoremove impl and it useless folders 42/77142/1
guillaume.lambert [Mon, 17 Sep 2018 13:09:56 +0000 (15:09 +0200)]
remove impl and it useless folders

Change-Id: I55618d4d1da2651661c0222f7e2610e8597914a1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoCorrect tp creation of Xponders in topo layer. 43/76643/4
Dhruv Bhardwaj [Thu, 4 Oct 2018 13:44:03 +0000 (09:44 -0400)]
Correct tp creation of Xponders in topo layer.

JIRA: TRNSPRTPCE-12
Change-Id: I27e891752709eda1e4606feaabba5db1c2eaecf4
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>
5 years agoMerge "Honeynode Enhancements"
Guillaume Lambert [Thu, 18 Oct 2018 13:23:45 +0000 (13:23 +0000)]
Merge "Honeynode Enhancements"

5 years agoMerge "Push service name to interfaces"
Guillaume Lambert [Thu, 18 Oct 2018 12:47:23 +0000 (12:47 +0000)]
Merge "Push service name to interfaces"

5 years agoHoneynode Enhancements 96/76796/1
Martial COULIBALY [Tue, 11 Sep 2018 13:42:41 +0000 (15:42 +0200)]
Honeynode Enhancements

- remove warnings with fluorine controller
- make Honeynode use only one configuration file with all container :
  * netconf streams
  * org-openroadm-device
  * currentPmlist

JIRA:TRNSPRTPCE-38
Change-Id: I167be28214058d4d55d0bf7b49b220edcda8e402
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agodowngrade dependencies to stable/fluorine SR1 94/76794/1
Martial COULIBALY [Tue, 9 Oct 2018 12:24:27 +0000 (14:24 +0200)]
downgrade dependencies to stable/fluorine SR1

Change-Id: I68e9c8cdd1ca52d6e9c1082f34ecb46be2ad7bd6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoPush service name to interfaces 40/76540/6
Dhruv Bhardwaj [Mon, 1 Oct 2018 17:35:46 +0000 (13:35 -0400)]
Push service name to interfaces

JIRA: TRNSPRTPCE-17
Change-Id: If47e38c645ca0c39610874d4674ca8245e489f84
Signed-off-by: Dhruv Bhardwaj <db929a@att.com.com>
5 years agofix Honeynode issues with fluorine 12/75112/14
Martial COULIBALY [Sat, 11 Aug 2018 00:33:12 +0000 (02:33 +0200)]
fix Honeynode issues with fluorine

- solve the OpenEXI compability with honeynode with a patch to
netconf-netty-util module
- solve the rpc 'get-schema' error by putting a netconfState info in the
OPERATIONAL datastore and copying in a dedicated folder all the yang
schemas needed at honeynode start-up (similarly to testtool)
- move device datastore config listener from core module
'minimal-distribution-core' to 'honeynode-plugin-impl' module.

JIRA: TRNSPRTPCE-32
Change-Id: I9af0ec2e098271a18993433cf99db9b3b5f73b20
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoFunctional tests for renderer 50/74650/5
Christophe Betoule [Fri, 1 Jun 2018 17:36:06 +0000 (19:36 +0200)]
Functional tests for renderer

These tests verify the renderer RPC service-path in a nominal usage.
These functional tests run on honeycomb based emulation nodes and verify
interfaces (och, otu, odu, Ethernet) and roadm-connection creation and
deletion on RDM and XPDR configuration datastore.

JIRA: TRNSPRTPCE-10
Change-Id: If05ea55c28289c5d264dde39c0b95c6913df1f88
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 years agoUpdate portmapping functional tests 49/74649/5
Gilles Thouenon [Wed, 18 Jul 2018 09:43:03 +0000 (11:43 +0200)]
Update portmapping functional tests

-replace testtool by honeycomb netconf node simulator for this test
suite
-adapt initial node configuration (new SRG for ROADM, different logical
connection point values for XPDR configuration)
-complement XPDR test configuration
-rationalize tox configuration accordingly

JIRA: TRNSPRTPCE-10
JIRA: TRNSPRTPCE-22
Change-Id: I70ccf0f53bf3bad4655888f3c4739be1aa628d99
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoUpdate PortMappingImpl for XPDR node 48/74648/5
Gilles Thouenon [Wed, 18 Jul 2018 10:01:44 +0000 (12:01 +0200)]
Update PortMappingImpl for XPDR node

-Check different possible values for "logical-connection-point" in XPDR
node configuration to be aligned with portmapping functional tests.

JIRA: TRNSPRTPCE-22
Change-Id: Ib66b6d52e9f7a006bce2718207804bf9a746cc02
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoMerge "fix netconf testtool portmapping"
Guillaume Lambert [Thu, 13 Sep 2018 13:01:12 +0000 (13:01 +0000)]
Merge "fix netconf testtool portmapping"

5 years agoMerge "Update unit testing - Renderer"
Guillaume Lambert [Thu, 13 Sep 2018 13:00:07 +0000 (13:00 +0000)]
Merge "Update unit testing - Renderer"

5 years agoMerge "fix more javadocs warnings"
Guillaume Lambert [Thu, 13 Sep 2018 12:59:52 +0000 (12:59 +0000)]
Merge "fix more javadocs warnings"

5 years agoFix R2R link deletion problem 60/76060/1
shweta [Mon, 23 Jul 2018 18:06:08 +0000 (14:06 -0400)]
Fix R2R link deletion problem

JIRA: TRNSPRTPCE-4
JIRA: TRNSPRTPCE-13
Signed-off-by: shweta <sv111y@att.com>
Change-Id: Ic48e2aa148b12f51d9380d34f890c96346ab018d

5 years agoMigrate transportpce docs to project repo 90/75890/2
Thanh Ha [Sun, 9 Sep 2018 01:31:20 +0000 (21:31 -0400)]
Migrate transportpce docs to project repo

Issue: DOCS-69
Change-Id: I035abf694de6e5fb23ef3457d6584402c11cafb9
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
5 years agoBootstrap transportpce documentation 89/75889/2
Thanh Ha [Sun, 9 Sep 2018 01:28:02 +0000 (21:28 -0400)]
Bootstrap transportpce documentation

Issue: DOCS-69
Change-Id: Ic3dd2d82ee6af8cdb50a971d1012646dc54f89d1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
5 years agofix more javadocs warnings 93/75793/1
guillaume.lambert [Tue, 4 Sep 2018 13:49:54 +0000 (15:49 +0200)]
fix more javadocs warnings

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

5 years agoBump versions by x.(y+1).z for next dev cycle 46/75746/2
Martial COULIBALY [Wed, 5 Sep 2018 07:36:53 +0000 (09:36 +0200)]
Bump versions by x.(y+1).z for next dev cycle

Change-Id: I7ffd75c755ab22eccdbb43a6743d98b7a0cb0a49
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate unit testing - Renderer 35/75235/2
doha.khaled [Wed, 1 Aug 2018 11:50:13 +0000 (13:50 +0200)]
Update unit testing - Renderer

JIRA: TRNSPRTPCE-11
Change-Id: I721603b6733accca1fa1fdaf2c3eb8f3cf0d77f2
Signed-off-by: doha.khaled <dkhaled.ext@orange.com>
5 years agofix netconf testtool portmapping 68/75168/1
Martial COULIBALY [Mon, 13 Aug 2018 13:32:39 +0000 (15:32 +0200)]
fix netconf testtool portmapping

Change-Id: I0a1aa88e3488fd585ea85616210761799ba046ad
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoAdd check in cp state to avoid npe 31/74931/1
Dhruv Bhardwaj [Tue, 7 Aug 2018 19:41:46 +0000 (15:41 -0400)]
Add check in cp state to avoid npe

Change-Id: I27469f5e95e7a20a5110628515ce099e760d1a51

5 years agoRemoved debug statement 30/74930/1
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:40:45 +0000 (14:40 -0400)]
Removed debug statement

Change-Id: Iabb51395f3ef8256da307d63b996d4c4612eead7

5 years agoUpdate xponder portmapping 29/74929/1
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:37:23 +0000 (14:37 -0400)]
Update xponder portmapping

Change-Id: Ib740319fc4b5ee9e6cd3a9b6e275f1321b465ec5

5 years agoMerge "Fix Issues coming up during end to end testing"
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:24:22 +0000 (18:24 +0000)]
Merge "Fix Issues coming up during end to end testing"

5 years agoFix Issues coming up during end to end testing 25/74925/7
shweta [Tue, 7 Aug 2018 17:23:58 +0000 (13:23 -0400)]
Fix Issues coming up during end to end testing

1. Correct NodeId read offset in ModelMapping Utils
2. Correct Portmapping creation for XPDR
3. Remove notification subscription feature
4. Deleted unit test file :
    RendererServiceOperationsImplTest,
    RendererServiceOperationsImplDeleteTest.

Change-Id: Id29187c59dac9b9afa7479e057a60448d3c42bca

5 years agoRemove the inventory feature 42/74742/2
guillaume.lambert [Wed, 1 Aug 2018 14:37:57 +0000 (16:37 +0200)]
Remove the inventory feature

The inventory feature needs to be rethought and also requires an
external DB that will not be shipped in the formal release.

Change-Id: I1eae9a429592151bc1faedb3473f9029b9dfc800
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix functional tests 51/74851/2
Martial COULIBALY [Mon, 6 Aug 2018 12:43:31 +0000 (14:43 +0200)]
fix functional tests

Change-Id: Iad15d5af4b9376bcb734412109a0b0a755d4ecd5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate unit testing - Renderer 54/74654/5
doha.khaled [Wed, 1 Aug 2018 11:50:13 +0000 (13:50 +0200)]
Update unit testing - Renderer

JIRA: TRNSPRTPCE-11
Change-Id: I42f760cdd39ed0a7585965a506ba05070b370529
Signed-off-by: doha.khaled <dkhaled.ext@orange.com>
5 years agoFix circuit-pack equipment state on XPDR 51/74651/5
Gilles Thouenon [Thu, 26 Jul 2018 10:08:32 +0000 (12:08 +0200)]
Fix circuit-pack equipment state on XPDR

Change the equipment state of circuit-packs supporting ETH and OCH
interfaces of XPDR node to "not-reserved-inuse" after creation and to
"not-reserved-available" after deletion.

JIRA: TRNSPRTPCE-28
Change-Id: Id662d1ef664f8283ca4ae7cd25a7f874351fdd7a
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoCreation of OTS-OMS interfaces 97/74797/2
Gilles Thouenon [Wed, 25 Jul 2018 11:26:48 +0000 (13:26 +0200)]
Creation of OTS-OMS interfaces

- add new rpc in renderer@2017-02-28.yang
- add 2 methods in OpenRoadmInterfaceFactory.java to create ots and oms
interfaces on ROADM configuration datastore
- add method in PortMappingImpl.java to update the associated mapping
with new interfaces just created
- modify DeviceRendererServiceImplTest.java and
RendererServiceOperationsImplTest.java to take into account blueprint
modification..

Change-Id: I4eb21aed513a5378d23559827bc581dad60412a3
JIIRA: TRNSPRTPCE-8
JIIRA: TRNSPRTPCE-33
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agofix unit test Renderer 39/74739/3
Martial COULIBALY [Wed, 1 Aug 2018 13:38:29 +0000 (15:38 +0200)]
fix unit test Renderer

JIRA: TRNSPRTPCE-11
Change-Id: Ibf13f1af6ba04755c624ee58e6a5520e14c44adc
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoclean some compilation warnings 38/74738/1
guillaume.lambert [Wed, 1 Aug 2018 13:04:04 +0000 (15:04 +0200)]
clean some compilation warnings

mostly remove LineLength warnings introduced in Fluorine bump changes

Change-Id: I1ab4cd671ad7a453abd2c5a158a7590bda7ca1ce
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoupdate netconf testtool version 08/74508/5
Martial COULIBALY [Thu, 26 Jul 2018 13:34:53 +0000 (15:34 +0200)]
update netconf testtool version

- switches testtool mock version from 1.3.1 to 1.5.0-SNAPSHOT
  (netconf dir git submodule switched to branch 'origin/master'):
  testtool 1.3.1 caused some errors with the fluorine controller for
  several reasons including EXI messages generation.
- updates patches, nose tests files and scripts consequently

JIRA: TRNSPRTPCE-32
Change-Id: I27476ea83edefbffff986ddc856078219f925fc6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoremove rfc8345 dependencies 68/74468/5
guillaume.lambert [Wed, 25 Jul 2018 15:36:17 +0000 (17:36 +0200)]
remove rfc8345 dependencies

- remove direct dependencies in ordmodels
- remove indirect dependencies inherited from mdsal models in others pom
- repackage correctly ietf-network-* models revision 2015-06-08

JIRA: TRNSPRTPCE-29

Change-Id: Icbf5f9cef59fed6f04c741f2cfb0875f63a82026
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agopackage ietf-network 2015-06-08 yang models 96/74296/7
guillaume.lambert [Fri, 20 Jul 2018 15:44:29 +0000 (17:44 +0200)]
package ietf-network 2015-06-08 yang models

JIRA: NETCONF-550
JIRA: TSC-124
JIRA: TRNSPRTPCE-29

Change-Id: I416422e94a8f684b1246efa21cddb424d2136c11
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoUpgrade to Fluorine dependencies 74/73974/9
Stephen Kitt [Wed, 11 Jul 2018 14:19:12 +0000 (16:19 +0200)]
Upgrade to Fluorine dependencies

This switches all the ODL dependencies to the appropriate versions for
Fluorine.

Note that due to the rfc8345 ietf-network migration, openroadm imports
of 2015-06-08 ietf-network-* models are no more available so this fails
to build until those obsolete draft models are repackaged inside tpce.
https://git.opendaylight.org/gerrit/#/c/73591/

JIRA: NETCONF-550
JIRA: TSC-124
JIRA: TRNSPRTPCE-29

Change-Id: I288e560cc9eb376facc61c34a098b3fba5f524d8
Signed-off-by: Stephen Kitt <skitt@redhat.com>
5 years agoRemove Karaf4 useless features 63/74663/3
guillaume.lambert [Mon, 30 Jul 2018 17:13:15 +0000 (19:13 +0200)]
Remove Karaf4 useless features

Change-Id: I02496ac1574d2094eb937fa995cad251ec94cafc
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix some compilation warnings 43/74343/4
guillaume.lambert [Mon, 23 Jul 2018 15:15:35 +0000 (17:15 +0200)]
fix some compilation warnings

Change-Id: I73d5b4906d85cfc2ab6e2457335192e8a8d19ce7
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoInitial unit testing commit - Renderer 47/74647/1
doha.khaled [Tue, 24 Jul 2018 11:04:21 +0000 (13:04 +0200)]
Initial unit testing commit - Renderer

JIRA: TRNSPRTPCE-11
Change-Id: Iae7f1d5d4e4b8d9ba3227b5debcc30437220d460

5 years agofix functional tests suite 40/74340/5
guillaume.lambert [Mon, 23 Jul 2018 14:42:26 +0000 (16:42 +0200)]
fix functional tests suite

- fix ServiceHandler Stub patch file
- fix the tox.ini configuration file so that the complete test suite can
  be performed
- comment out the portmapping and servicehandler tests 01 since there is
  no more netconf node "controller-config" automatically connected

Change-Id: I044063b6adc06a42d58101d66cc8712b44ec55b4
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoRPC to delete link 87/74287/2
Dhruv Bhardwaj [Mon, 9 Jul 2018 04:25:04 +0000 (00:25 -0400)]
RPC to delete link

Implemented RPC to delete link with a given link-id

JIRA: TRNSPRTPCE-16

Change-Id: I722002997250d4dd07a2f9195f4828eecc7dcfee

5 years agoManage service deletion on XPDR node 86/74286/2
Gilles Thouenon [Thu, 5 Jul 2018 14:01:12 +0000 (16:01 +0200)]
Manage service deletion on XPDR node

-Manage the case where XPDR ports (client, line) are unidirectionals.
-Test if an OCH interface is not used by another cross-connection
(in the reverse side) before deleting it (new isUsedByXc() method).

Change-Id: Icceef760c21626c96ea1c48b417fd2332372da47
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 years agoServiceHandler unit testing update 85/74285/2
doha.khaled [Thu, 12 Jul 2018 10:55:29 +0000 (12:55 +0200)]
ServiceHandler unit testing update

The Complete unit testing for the ServiceHandler module

Change-Id: Ica4bbba4e94bd46c8c44d965071fe0409abd4637

5 years agoService Handler unit test update 84/74284/2
doha.khaled [Thu, 5 Jul 2018 13:52:03 +0000 (15:52 +0200)]
Service Handler unit test update

-serviceReroute
-PCEServiceWrapper

Change-Id: I0f77e47d1b246c9349c15c50b9a0187d099053dd

5 years agoTest alignment between topology and portmapping 83/74283/3
Ahmed Triki [Fri, 6 Jul 2018 07:31:35 +0000 (09:31 +0200)]
Test alignment between topology and portmapping

- connect one ROADM and one XPDR
- check the alignment of the TPs naming between both the topology
and what appears in the port mapping
- test 5 fails because naming of TP  are not aligned for the XPDR

JIIRA: TRNSPRTPCE-5
Change-Id: I514f2cae964c8cb12e2bb8700a19d946f4059b72
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
5 years agoTopology functional tests bugs correction 09/74509/5
Ahmed Triki [Thu, 26 Jul 2018 13:50:53 +0000 (15:50 +0200)]
Topology functional tests bugs correction

- modify the code to ignore the order of appearance of nodes or links
in the REST query responses
- tests 24, 25, 33 and 37 have been commented out. They fail because of
  current mocks limitations.
- add the karaf launch option "server"

JIRA: TRNSPRTPCE-4
JIRA: TRNSPRTPCE-13
Change-Id: I7662255acbfd1a2fe075a7397f23e606a4252d92
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
5 years agoFunctional tests for the topology init 81/74281/2
Ahmed Triki [Thu, 28 Jun 2018 09:22:34 +0000 (11:22 +0200)]
Functional tests for the topology init

- connects successively ROADMA, XPDRA ROADMB and ROADMC and then
disconnect them
- checks that the clli-network, the openroadm-network and the
openroadm-topology are well updated and the appropriate links/nodes
are well created/deleted after each creation/deletion operation
- checks that a degree is not used by more than one link at the same
time
- tests 9 and 17 currently fail beause 4 TPs appear (XPDR1-CLIENT1,
XPDR1-NETWORK1, XPDR1-CLIENT2 and XPDR1-NETWORK2) while only 2 TPs are
defined in the sample-config-XPDRA.xml
- tests 24, 33 and 37 currently fail because the link ROADM-to-ROADM
is not automatically deleted.
A new version of the code will be proposed by ATT where these links will
be marked as up or down:
    Up to indicate the pce that the path is available for service
    Down to indicate that the path is not available

JIRA: TRNSPRTPCE-4
Change-Id: Iba78869ad884fadd766f11c4c321ae1b4bdfcd64
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
5 years agofix karaf launch error from tox 76/74576/2
Martial COULIBALY [Fri, 27 Jul 2018 12:15:22 +0000 (14:15 +0200)]
fix karaf launch error from tox

Add a karaf launch option 'server' in python nose files.
This option disables the karaf local console.
(OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true")

Change-Id: Iac160454fa6a74aa31813dacbb74a94dce417592
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agofix some karaf runtime errors 95/74395/6
Martial COULIBALY [Tue, 24 Jul 2018 13:08:30 +0000 (15:08 +0200)]
fix some karaf runtime errors

remove the following errors :
- netconf-monitoring already start error
- netconf-impl completion error cause by netconf-console
the netconf CLI is still broken at startup but works again after one
Netconf device has been connected (through the REST API)

JIRA: NETCONF-534
JIRA: TRNSPRTPCE-6
Change-Id: Idec350c7679891098bd8b94448292468a787fa1c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoIncrease OLM timer to turn-up xc power in RDM node 80/74280/2
Gilles Thouenon [Thu, 5 Jul 2018 10:07:10 +0000 (12:07 +0200)]
Increase OLM timer to turn-up xc power in RDM node

Increase a timer from 20s to 60s when the RDM node is in a "power" state
to let it configure the optical power level of a cross-connection before
moving to "gainLoss" state.
NB: The value recommended in the openroadm whitepaper is normally 20s.

Change-Id: Ife8153f11977844f2b074d118e1dcfe93858eb79
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoBug corrections in ServiceHandler 79/74279/1
Martial COULIBALY [Tue, 3 Jul 2018 12:53:07 +0000 (14:53 +0200)]
Bug corrections in ServiceHandler

- Change CONFIGURATION datastore to OPERATIONAL which is the right
LogicalDatastoreType to look into to get services already created.
- Fix the bug mappingServices method in ModelMappingUtils class.

Change-Id: I23a0871e0f1d50180c3b09f185693888e2a83840
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Co-authored-by: Doha Khaled <dkhaled.ext@orange.com>
5 years agoFunctional Tests for servicehandler 61/73561/14
Martial COULIBALY [Tue, 3 Jul 2018 14:19:51 +0000 (16:19 +0200)]
Functional Tests for servicehandler

These tests verify the servicehandler RPCs service-create and
service-delete.
Some tests have been (temporarily) disabled because a few RPCs are no
more available following the ServicePath downgrade from 1.6 to 1.5 :
cf change 72037 'ServiceHandler update for new PCE compatibility'

Change-Id: Ib57a35aef9cd89fc7b3e26bbd43d6a5195e5d533
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoServiceHandler unit tests init 60/73560/7
doha.khaled [Thu, 14 Jun 2018 11:35:19 +0000 (13:35 +0200)]
ServiceHandler unit tests init

Change-Id: I4cd1989fea6971e7d06874978fe05d33407c0f78
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: doha.khaled <dkhaled.ext@orange.com>
5 years agoServiceHandler update for new PCE compatibility 59/73559/7
Shweta V [Wed, 20 Dec 2017 11:14:14 +0000 (12:14 +0100)]
ServiceHandler update for new PCE compatibility

- Updates to have org-openroadm-service.yang
- Creates new mapping utils
- Implements service-create, service-reroute and service-delete RPCs
- Integrates the Service handler with PCE, Renderer, OLM and network
topology manager
This commit downgrades the Service Handler functions to the servicepath
1.5 YANG specifications so that they match with the PCE current RPCs.
This implies that some RPCs already implemented in servicepath 1.6
(service-reconfigure,service-restoration) will no more be available,
at least until the PCE is upgraded.

Change-Id: I94f2edbcfbde22747871e7eec55ed01e198e40af
Signed-off-by: Shweta <sv111y@att.com>
Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agofix karaf runtime log console 66/74266/2
Martial COULIBALY [Fri, 20 Jul 2018 07:11:31 +0000 (09:11 +0200)]
fix karaf runtime log console

JIRA: TRNSPRTPCE-6
Change-Id: I6f7b46c77f54742a02de2b8200d04e3592f34bea
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agofix some compilation warnings 79/73779/5
guillaume.lambert [Thu, 5 Jul 2018 14:16:19 +0000 (16:16 +0200)]
fix some compilation warnings

Change-Id: I007c87de212afbc58ad91965eeefa3649066c375
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoPCE module init 58/73558/5
Shweta V [Wed, 20 Dec 2017 11:12:58 +0000 (12:12 +0100)]
PCE module init

- Minimim hop based path calculation using network model
- Weighted path calculation based on propagation delay
- Checks available wavelength
- Supports hard constraints based routing with latency
- Provides JUnit tests
- Adds a pce functionnal test  (python script 'tests_pce.py')
- Creates for it a specific profile called 'pce' in the tox.ini file.
  PCE functionnal tests can be launched from the tests folder with
  the command 'tox -e pce'

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I7be504ec423e240baaeaa731d50424be46df82ea
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agofix build configuration and dependencies 06/73706/18
guillaume.lambert [Tue, 3 Jul 2018 14:20:31 +0000 (16:20 +0200)]
fix build configuration and dependencies

repair project build by correcting dependencies import

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