Ahmed Triki [Mon, 24 Jun 2019 15:39:48 +0000 (17:39 +0200)]
add gnpy results to pce:path-computation-request
- update transportpce-pce yang model revision
- modify the ouput of the RPC in transportpce-pce yang model
- implement the gnpy result in the pathComputationServiceImpl
JIRA: TRNSPRTPCE-49
Change-Id: I4a49cb6ee8c8cc239c805dba3a516bcfe028306e
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
Ahmed Abbas [Mon, 24 Jun 2019 13:15:43 +0000 (15:15 +0200)]
UT for ServicehandlerImpl update
UT for method serviceFeasibilityCheck
Change-Id: I7e61e48410049289f4688e1deade4725e1e7b010
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Guillaume Lambert [Fri, 21 Jun 2019 14:14:26 +0000 (14:14 +0000)]
Merge "fix some sonar issues"
Guillaume Lambert [Fri, 21 Jun 2019 14:13:21 +0000 (14:13 +0000)]
Merge "fix sonar clumsy issues"
Guillaume Lambert [Fri, 21 Jun 2019 14:13:11 +0000 (14:13 +0000)]
Merge "remove dead code pointed out by sonar"
Guillaume Lambert [Thu, 20 Jun 2019 08:01:28 +0000 (08:01 +0000)]
Merge "fix ServicehandlerImpl Junit warnings"
Gilles Thouenon [Wed, 12 Jun 2019 15:44:46 +0000 (17:44 +0200)]
handle OLM when spanloss > 28dB
- when calculated spanloss is out of OpenROADM range ( = ]0-28] dB),
it is all the same set in the OTS interface.
- when the spanloss is greater than 28 dB ,
the OLM servicePowerSetup fails and triggers the rollback of
roadm-connection interfaces already configured by the renderer.
- Change OlmServiceStub to result value to success
NB: OpenROADM specifies that spanloss must be < 27 dB but there is 1 dB
of tolerance in the measurement accuracy.
Thus the supported range for spanloss = ]0,28] dB.
Change-Id: Ibae4357bde37ba78fc5bface060099f4bb7be0b6
JIRA: TRNSPRTPCE-90
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
guillaume.lambert [Wed, 19 Jun 2019 13:45:40 +0000 (15:45 +0200)]
fix ServicehandlerImpl Junit warnings
Change-Id: I713457cc79344f3e76395ed08b33698efd72c281
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 18 Jun 2019 08:33:26 +0000 (10:33 +0200)]
fix some sonar issues
JIRA: TRNSPRTPCE-133
Change-Id: Idd9ff2a296c5e9c066d3bdfcb149a9f1fffa5d22
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Wed, 19 Jun 2019 12:53:48 +0000 (12:53 +0000)]
Merge "UT for ServicehandlerImpl"
guillaume.lambert [Tue, 18 Jun 2019 10:14:43 +0000 (12:14 +0200)]
remove dead code pointed out by sonar
JIRA: TRNSPRTPCE-133
Change-Id: Ibb9e073a7c32a524d643b337d04116eaf5111e1f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 18 Jun 2019 09:44:47 +0000 (11:44 +0200)]
fix sonar clumsy issues
JIRA: TRNSPRTPCE-133
Change-Id: Iec0da57ea10bf0553205ca1ffc786b76c17c01f1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 19 Jun 2019 09:27:15 +0000 (11:27 +0200)]
disable E2E tests voting
it seems some upstreams changes broke the E2E tests.
It is likely because ordm 4.1 YANG deviations are now taken in account.
JIRA: TRNSPRTPCE-126
JIRA: TRNSPRTPCE-129
Change-Id: I359573b8559a0443a08be26045e772d2c9ab1902
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Rami [Tue, 18 Jun 2019 12:37:27 +0000 (14:37 +0200)]
UT for ServicehandlerImpl
- UT for methods create service and delete service
Change-Id: I0398dac41d4fac687dcdbe8fc7ef7cfa7f1003e9
Signed-off-by: Rami <rmohamed.ext@orange.com>
Guillaume Lambert [Tue, 18 Jun 2019 07:42:38 +0000 (07:42 +0000)]
Merge "fix OlmUtils issues reported by Sonar"
guillaume.lambert [Mon, 17 Jun 2019 14:29:04 +0000 (16:29 +0200)]
fix OlmUtils issues reported by Sonar
JIRA: TRNSPRTPCE-112
Change-Id: Iffbfd814e2dc0ee1c80180fcf4edceb9f9cd6120
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Mon, 17 Jun 2019 09:47:47 +0000 (11:47 +0200)]
enable -1 voting in topoPortmapping and E2E tests
topoPortmapping and E2E include expected failures in some tests.
This change
- adds a unittest.expectedFailure decorator to the tests unit expected
to fail.
This way the test suite will return success even if they fail.
- enables topoPortmapping and E2E tests failure reports to Jenkins.
Change-Id: I679526af0afb01ba08b57a726ff137ff3431916d
JIRA: TRNSPRTPCE-129
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Thu, 13 Jun 2019 08:43:29 +0000 (10:43 +0200)]
reenable Jenkins -1 voting in functional tests
Jenkins +1 voting was forced in tox macro to ease the development phase
of functional tests.
Except topoPortmapping and E2E, all tox functional tests are now
expected to pass but they do not currently report failures to Jenkins.
This change reenables failures reports to Jenkins for those tests.
Change-Id: If305326ef6e208aa55116ccb2b88bca68d9f9f4a
JIRA: TRNSPRTPCE-129
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Thu, 6 Jun 2019 10:33:29 +0000 (12:33 +0200)]
End-to-end functional tests with device2.2.1
- for a much better visibility en test results, adapt sequence of tests
(creation of the topology) to force PCE to have a deterministic result
and hence alleviate to have several tests failling
- only tests 47 and 48 should fail for the non-deterministics
effect of the PCE.
JIRA: TRNSPRTPCE-113
Change-Id: Idc697c560730cbc2bf910e43f9be80b58a587348
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Thu, 6 Jun 2019 10:36:53 +0000 (12:36 +0200)]
Fix bug in FixedFlexImpl and its use by renderer
Change-Id: Iafa5a0167352f5c43df44d5be64f862e8330778f
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Ahmed Triki [Thu, 25 Apr 2019 13:38:59 +0000 (15:38 +0200)]
exchange with GNPy to check path feasibility
- add gnpy data model in api module
- add package in pce to connect to gnpy
- modify PCESendingPceRPC to support gnpy
- move test-common DataStoreContext and binding converter classes to
transportpce-common, adapt pom files dependencies
JIRA: TRNSPRTPCE-87
Change-Id: Ia93fbe0665427530afe33b623ee9aeb3d9f121bb
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
Co-authored-by: Esther Le Rouzic <esther.lerouzic@orange.com>
guillaume.lambert [Tue, 11 Jun 2019 09:40:06 +0000 (11:40 +0200)]
Bump mdsal and netconf deps to Neon SR2 snapshot
Change-Id: I2b065d035b8b0365bec77736a51988bbd6592499
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Fri, 7 Jun 2019 15:42:11 +0000 (15:42 +0000)]
Merge "decrease OLM timers in functional tests"
Guillaume Lambert [Fri, 7 Jun 2019 14:13:32 +0000 (14:13 +0000)]
Merge "automate lighty.io build process"
guillaume.lambert [Fri, 7 Jun 2019 13:22:41 +0000 (15:22 +0200)]
decrease OLM timers in functional tests
- create a custom comment to identify code pieces to modify
- in tox.ini add a custom line to modify the code before building project
- modifiy OLM funcional tests timers
- fix a tox.ini bug in ordm 2.2.1 functional tests profiles
Change-Id: I80109e6738e9424bca175b0fe3f87c75c1c00f9e
JIRA: TRNSPRTPCE-112
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Thu, 6 Jun 2019 10:42:45 +0000 (12:42 +0200)]
Add timer constants in olm
to ease convergence times customization.
This can speed up functional tests run against the honeynode emulator
since there is no real signal to make converge
JIRA: TRNSPRTPCE-112
Change-Id: I3222a9cf2ebd2ee11bd7a005ca0ab9309bfb9a0a
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
guillaume.lambert [Fri, 7 Jun 2019 09:55:13 +0000 (11:55 +0200)]
automate lighty.io build process
in the lighty folder
- create a patch file to remove deviations from ordm 4.1 network models:
org-openroadm-otn-network-topology@2018-11-30.yang
org-openroadm-network-topology@2018-11-30.yang
org-openroadm-network@2018-11-30.yang
- script the lighty.io build process described in the README file
- patch ordm 4.1 network models mentionned above
- build transportPCE with karaf
- download and build lighty-core 10.x.x
- build transportPCE with lighty.io
- comment out patch and lighty-core folder clean-up
- mention the script in the README file
JIRA: TRNSPRTPCE-126
Change-Id: I6bfedb2f9424304d4f86f8ede8bc49521c3cb185
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Juraj Veverka [Fri, 7 Jun 2019 07:22:49 +0000 (09:22 +0200)]
lighty.io initializer
JIRA: TRNSPRTPCE-126
Change-Id: I3169c24220fe64221b2633a2cb9a9e71134b0b2e
Signed-off-by: Juraj Veverka <juraj.veverka@pantheon.tech>
guillaume.lambert [Thu, 6 Jun 2019 13:14:26 +0000 (15:14 +0200)]
fix javadocs warnings
Change-Id: I1d53db7fcb1fd93b2f0f9eb18bf10210b11ff463
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Mon, 3 Jun 2019 14:50:59 +0000 (16:50 +0200)]
Fix OLM bugs to make olm functional tests running
JIRA: TRNSPRTPCE-106
Change-Id: I028c6caa98207c0ebfb3743e201ecdb31d3e4a75
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Fri, 24 May 2019 08:49:23 +0000 (10:49 +0200)]
Fix bugs to make renderer functional tests running
- add management of equipment-state change for XPDR 221 devices
- disable org-openroadm-service update when using
transportpce-device-renderer:service-path rpc
JIRA: TRNSPRTPCE-105
Change-Id: Ib5de2d10c5acc3fa41dddd9ec2f19453f5fc8384
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Gilles Thouenon [Thu, 2 May 2019 13:33:53 +0000 (15:33 +0200)]
Integrate renderer & olm code to run on device221
- retrieve OLM modifs from change 80051
- integrate olm for device221
- integrate pm221 management
- getPm is running on device/pm 221, but impossible to get a
'current-pm-entry' from 'current-pm-list'! Forced to take the entire
list...
- change the isUsedByXc method (placement + code for device221)
- change the interface name for roadm-connection 221
- adapt code to delete interfaces 221 (lcp-nmc / lcp-mc)
- update olm functional tests with device 121
- corrections in olm code to make olm functional tests with device
121 running
JIRA: TRNSPRTPCE-105
JIRA: TRNSPRTPCE-106
Change-Id: Ie1e36a01b9d128c168b6784fb2356f25873b6147
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Dhruv Bhardwaj <db929a@att.com>
Co-authored-by: Shweta Vachhani <sv111y@att.com>
Gilles Thouenon [Tue, 21 May 2019 15:47:50 +0000 (17:47 +0200)]
prepare func tests for openroadm v2.2.1 support
add openroamd version 2.2.1 support for the following functional tests:
- portmapping
- topology
- renderer service path nominal
- creation/deletion of interfaces and roadm-connection on devices.
- add equipment-state in XPDRA configuration file (circcuit-pack).
- OLM
JIRA: TRNSPRTPCE-112
JIRA: TRNSPRTPCE-113
Change-Id: I746e4962e05ac9570721260a1df289f3bf974448
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Dhruv Bhardwaj [Thu, 23 May 2019 09:24:06 +0000 (11:24 +0200)]
introduce ordm v2.2.1 support for OLM and renderer
JIRA: TRNSPRTPCE-105
JIRA: TRNSPRTPCE-106
Change-Id: Iadf01663285253c147b720826923887e61a32b1b
guillaume.lambert [Wed, 29 May 2019 13:17:46 +0000 (15:17 +0200)]
clean test environment
- remove testtool traces
- remove servicehandler functional tests and associated stubs
- rationalize honeynode multiple openroadm versions support:
move code for 2.1 and 2.2.1 versions in the same folder
only one script to build (version passed as argument - def is 2.1)
- clean repo from tabs and dos formatted files
JIRA: TRNSPRTPCE-112
Change-Id: Id893085733cdc21bbec27062afee4df6f9763c75
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Tue, 21 May 2019 15:41:50 +0000 (17:41 +0200)]
Add Honeynode emulator for device221
- new version of honeynode emulator for managing org-openroadm-device
2.2.1 and org-openroadm-pm 2.2.1
- new simple configuration files for XPDR and ROADM (with bidirectionnal
ports)
Change-Id: I5c470514fdb5ffe5c33d2ebc3933b10007b6944e
JIRA: TRNSPRTPCE-101
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
guillaume.lambert [Tue, 26 Mar 2019 13:51:38 +0000 (14:51 +0100)]
add docker support for sims
JIRA: TRNSPRTPCE-112
Change-Id: I0bb41a66a895a0585b5545f64801a9d84ae75b3d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 28 May 2019 09:46:56 +0000 (11:46 +0200)]
test topoPortMapping adapted to Honeynode
Change-Id: I8cf63c7389383d630638e192fd6304a5b067f70b
JIRA: TRNSPRTPCE-68
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gael [Wed, 14 Nov 2018 13:10:20 +0000 (14:10 +0100)]
test topology adapted to Honeynode
From last commit : old test with testtool is not called in tox anymore.
Tests 9 and 17 in test-topology are now completed to check termination
points (related to PS 77801).
A config file was created to emulate node ROADMB with honeynode.
Corresponding test script was adapted. Tox was modified accordingly.
JIRA: TRNSPRTPCE-68
Change-Id: I5f1dd82be95f523d0942a582c0f156c09920e99a
Rami [Thu, 16 May 2019 07:19:56 +0000 (09:19 +0200)]
Increase ServiceHandler Junit coverage
Increase SH UT coverage for
- ModelMappingUtils
- MappingConstraint
- ServiceDataStoreOperation
- ServiceHandlerCompliancyCheck
- ServiceHandlerTxRxcheck
Change-Id: I37449064357888ea60b4c9bc7be62054da2c9c24
Signed-off-by: Rami <rmohamed.ext@orange.com>
guillaume.lambert [Mon, 6 May 2019 15:44:57 +0000 (17:44 +0200)]
Bump to Neon SR1 dependencies
yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter
createExclusiveWriter has now 2 prototypes
JSONDataObjectConverter.java has to be adapted to avoid ambiguity
Change-Id: Icc52836dd3b34941af5eb36010acf9add5182596
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Mon, 29 Apr 2019 09:49:24 +0000 (11:49 +0200)]
Fix some bugs in topology tests
Remove in some tests the manual node deletions in openroadm-network.
This action is already performed by TransportPCE when disconnecting the
topology-netconf device. Related tests should no longer report an error.
NB: test_05 in test_topoPortMapping.py still fails because of a bug in
the creation of xpdr device in the openroadm-topology.
JIRA: TRNSPRTPCE-86
Change-Id: Icf0eb7b38a2bd6f82b24a64ed32c44238fdb9087
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Guillaume Lambert [Thu, 25 Apr 2019 12:13:39 +0000 (12:13 +0000)]
Merge "rationalize ordmodels network pom"
guillaume.lambert [Thu, 25 Apr 2019 08:44:35 +0000 (10:44 +0200)]
fix some warnings
Change-Id: I7a6e65bd7bda14e483c32cafcc9bbf5349e4d11a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Fri, 12 Apr 2019 15:02:01 +0000 (17:02 +0200)]
rationalize ordmodels network pom
Change-Id: I9d9c59095863a354801a38ea42473f5d2233a1ae
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Wed, 24 Apr 2019 09:54:50 +0000 (11:54 +0200)]
functional tests update for network model 4.1
Most functional tests have become obsolete after upgrading OpenROADM
network models from version 2.1 to 4.1
Sample config topology files and urls in python scripts needed to be
updated consequently.
Change-Id: I4a4e3169f1629f31ccc10ba9b9faccb06187d47e
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Thu, 18 Apr 2019 09:39:38 +0000 (11:39 +0200)]
remove faulty UTs
PceManyTests and ServiceHandlerImplTest need to be updated to support
ordm 4.1 network models.
NetworkTransaction has not been migrated and has no extension.
Change-Id: I3277ca9fa936cf61b69de4272029514e029a9124
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Thu, 11 Apr 2019 08:41:18 +0000 (10:41 +0200)]
Upgrade Network model from 2.1 to 4.1
- update models to migrate network models to 4.1
- adapt new yang model naming to be compliant with ODL
- integrate rfc8345 dependencies in network/pom
- adapt all the code to new models
Change-Id: Ia48271cb45590aa59956130f5d80891c4140a749
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Dhruv Bhardwaj <db929a@att.com>
Co-authored-by: Shweta Vachhani <sv111y@att.com>
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>
guillaume.lambert [Wed, 17 Apr 2019 14:14:29 +0000 (16:14 +0200)]
Bump to Neon SR1 dev dependencies
Change-Id: I975487a80160c897c2f23b318bf9451c27f12b5d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Rami [Thu, 11 Apr 2019 15:17:32 +0000 (17:17 +0200)]
Unit Tests update
- increase the test coverage for ServiceDataStoreOperationsImpl
- remove unsed setup for ServiceDataStoreOperationsImplTest
- check if pathDescritpion is not null in mappingServicePaths method in
ModelMappingUtils
Change-Id: Icc4dd86d609f9833891698ba521397bb246ec56a
Signed-off-by: Rami <rmohamed.ext@orange.com>
Gilles Thouenon [Thu, 4 Apr 2019 07:09:48 +0000 (09:09 +0200)]
Reintroduce (ordm 2.2.1) Rdm2Rdm links in topo
- complete portMapping with GE interfaces from lldp in CpToDegree
- delete mapping and node/link from topo when disconnecting device
Change-Id: I989e62523bf7a635f3b3ad2d5fa985fdabfcca4c
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Wed, 3 Apr 2019 14:21:11 +0000 (16:21 +0200)]
Code correction to integrate 2.2.1 devices in topo
- change several device datastores from config to operational
- reactivate node deletion/portmapping deletion
Change-Id: I3c8ee105b977d12adbebc1116545fa04185013c8
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
shweta [Tue, 2 Apr 2019 12:23:46 +0000 (14:23 +0200)]
Prepare NetworkModel to support ordm 2.2.x devices
Adapt topology modifications from change 80051
https://git.opendaylight.org/gerrit/#/c/80051/
They initially supported 2.2 openroadm devices and have been adapted to
support openroadm 2.2.1 devices.
Change-Id: Ia659c19b4f695d2054c0757b101d9e895108f957
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
guillaume.lambert [Fri, 12 Apr 2019 13:04:58 +0000 (15:04 +0200)]
Bump project version to Sodium
Change-Id: Ic437ccde60d60f9f9449a334ddb29cf2868712c1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Sat, 23 Mar 2019 00:03:02 +0000 (01:03 +0100)]
update docs
Change-Id: I992f3b64af3763ac51b1ec47cf250bc9a7bc1080
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
shweta [Fri, 22 Mar 2019 21:48:26 +0000 (17:48 -0400)]
upgrade openroadm models to 2.2.1
Added alarm and LLDP for 2.2.1
Change-Id: Ide21da84e6cec9c148cef3155471b8263133bf33
Signed-off-by: shweta <sv111y@att.com>
Guillaume Lambert [Thu, 21 Mar 2019 16:27:23 +0000 (16:27 +0000)]
Merge "PortMapping for device 1.2.1 and 2.2"
Christophe Betoule [Wed, 20 Mar 2019 16:40:15 +0000 (17:40 +0100)]
PortMapping for device 1.2.1 and 2.2
- detect openRODAM device version in NetConfTopologyListener.java
- add getNode method in PortMapping to get general node info
- disable LinkDiscovery for device 2.2 to alleviate exceptions
Change-Id: Id836a31e6a754d281acc237d46a121a0c6ae5d0e
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
guillaume.lambert [Wed, 20 Mar 2019 16:12:08 +0000 (17:12 +0100)]
clean tests folder
- remove some useless files
- rationalize sample configs directory
- review sims port assignation to avoid that 2 different honeynode confs
use the same port
- introduce some delimiters in nose tests files for Xtesting purpose
Change-Id: Ife26be63d2725f05cc8fb2dd76c439d5464d01bf
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Fri, 15 Mar 2019 11:19:22 +0000 (12:19 +0100)]
clean some files
remove useless trailing blanks and tabs
Change-Id: I6f70ff1599025fb8cbe44a6cd22ab0a2d8730b1b
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Fri, 15 Mar 2019 08:37:26 +0000 (08:37 +0000)]
Merge "fix renderer UT"
Guillaume Lambert [Fri, 15 Mar 2019 08:36:30 +0000 (08:36 +0000)]
Merge changes from topic 'ordm22'
* changes:
fix some warnings
Fixed Issues with PCE
Update Renderer Module
clean yang files
Sync Common folder
Robert Varga [Thu, 14 Mar 2019 15:57:01 +0000 (16:57 +0100)]
Do not override mockito versions
odlparent ships newer mockito, using that version fixes build
with JDK11.
Change-Id: I71328a9395e36f96a19ed08602f7017b97e8da8b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
guillaume.lambert [Thu, 7 Mar 2019 17:01:03 +0000 (18:01 +0100)]
fix renderer UT
Change-Id: Ic68cf87cc9441d4bef4e887e68fd583f1f76e984
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 6 Mar 2019 17:14:03 +0000 (18:14 +0100)]
fix some warnings
Change-Id: If9e4228dda974760d7bccb2f85a950c299c3d377
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Shweta Vachhani [Wed, 13 Mar 2019 17:35:30 +0000 (13:35 -0400)]
Fixed Issues with PCE
Change-Id: If01fe6b049f6ea6d225df46e8faee3ee8d0dc2de
Signed-off-by: Shweta Vachhani <sv111y@att.com>
shweta [Wed, 12 Dec 2018 22:41:28 +0000 (17:41 -0500)]
Update Renderer Module
- introduce support for ordm 2.2
- update OLM unit tests to support render and common module changes
- update portmapping to trigger roadm-to-roadm link discovery with lldp
Change-Id: I955b00e903a1124a24668d27955bbc02cd5d651a
Signed-off-by: shweta <sv111y@att.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
guillaume.lambert [Wed, 19 Dec 2018 13:34:24 +0000 (14:34 +0100)]
clean yang files
remove tabs and trailing blank
Change-Id: I4ccea152ff4edf01a9a8ea6808c52b1f1120ebb1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Dhruv Bhardwaj [Mon, 26 Nov 2018 18:51:56 +0000 (13:51 -0500)]
Sync Common folder
1. Updated transportpce-portmapping.yang to support device version
2. Added support for flex-grid (fixed mapping)
3. Network Transaction service
4. Cross Connect support for version 2.2
5. Interface support for version 2.2
6. Portmapping support for 2.2
7. Updated openroadm 1.2 yang models
8. Added openroadm 2.2 yang models
Change-Id: I1a5c1e2f93399c0cccb10f1db2d41b3052794dfd
guillaume.lambert [Thu, 7 Mar 2019 09:37:31 +0000 (10:37 +0100)]
update MDSAL model to 0.13.2
this non-SNAPSHOT version now builds correctly.
(ietf-interfaces no more missing from nexus)
Change-Id: Ibf2914bfe647e173fe378f748ee52a02327d7e65
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Thu, 7 Mar 2019 09:05:55 +0000 (10:05 +0100)]
fix some sonar issues
Change-Id: I5fc4f68a23955b0dfac2e25dc70adbd8dc19b15f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Ahmed Triki [Thu, 21 Feb 2019 15:10:37 +0000 (16:10 +0100)]
fix minor bugs in end2end tests
- change the messages returned when a service is created and deleted
- change the timer in the case of creation and deletion of a service
Change-Id: I828b0371f71814e41b96f0888f948fe6b2b9b18b
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
Rami [Thu, 14 Feb 2019 14:17:59 +0000 (16:17 +0200)]
renderer unit test for neon
- reintroduce renderer UT by adapting them to Neon
- change check empty list to check null : deleteUseWL doesn't remove
elements from list but the type attributes that contains the WL list
Change-Id: Id855ef011fd1b11d2476bfa27fd25bd3aa3a2a3f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 5 Mar 2019 14:58:29 +0000 (15:58 +0100)]
update mdsal models version
Change-Id: I3d50fadd5463d96280733ad51b66faf927eced00
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 20 Feb 2019 15:45:13 +0000 (16:45 +0100)]
Rationalize poms
- remove mdsal binding models + ietf and iana models versions.
They are inherited from binding-parent.
- remove useless karaf4 related dependencies.
Change-Id: Ic3ca904175e134597cdc1331eb71c4dca723a6a7
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Ahmed Triki [Tue, 19 Feb 2019 17:06:44 +0000 (18:06 +0100)]
fix renderer_service_path_nominal tests
change the error message returned in case of non existing node
(ODL REST API modified with bump to Neon)
Change-Id: I25ce9c58e38ec4d9d9270f56faf22ccb2a11a8ea
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
Ahmed Triki [Tue, 19 Feb 2019 16:00:31 +0000 (17:00 +0100)]
fix minor bugs in portmapping
- comment out tests concerning the (obsolete) controller-config
- change the supporting-port id for the XPDRA (caused by E2E tests)
- change the error message returned in case of non existing node
(ODL REST API modified with bump to Neon)
- fix tests index number
Change-Id: Id3cedfc8dd193a94633ee18d4514a5b905bbe770
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
guillaume.lambert [Wed, 20 Feb 2019 10:23:06 +0000 (11:23 +0100)]
fix mdsal binding models
downgrade mdsal binding models to 1.2.6 (non SNAPSHOT) and others ietf
or iana models to 0.13.6 and 1.0.6 so that they are aligned with mdsal
binding parent version 3.0.6 (neon SR0 target)
Change-Id: I5012741cbf1dd714474af7209199008c37b3649a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Mon, 18 Feb 2019 19:15:24 +0000 (20:15 +0100)]
upgrade mdsal models
Change-Id: I4f739b40eed4d3bae52f17f18506e05d0f469bfe
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 12 Feb 2019 14:42:42 +0000 (15:42 +0100)]
deactivate faulty unit tests
Those unit tests now fails after neon bump.
Change-Id: I27144d6273fa6df6ccd42789a4bd5463afb2689d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Sat, 2 Feb 2019 23:21:17 +0000 (00:21 +0100)]
mv BP XML from org/opendaylight to OSGI-INF/
Blueprint XML files moved, following
https://wiki.opendaylight.org/view/Neon_platform_upgrade#Blueprint_declarations
find . -path '*/src/main/resources/org/opendaylight/blueprint/*.xml'
-execdir sh -c "mkdir -p ../../../OSGI-INF/blueprint; git mv {}
../../../OSGI-INF/blueprint" \;
Change-Id: I0421619ffd5116b919605c45fc474c938238b06f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 5 Dec 2018 14:28:54 +0000 (15:28 +0100)]
Bump to Neon
Upgrade poms core dependencies:
org.opendaylight.odlparent 4.0.9
org.opendaylight.yangtools yangtools-artifacts 2.1.8
org.opendaylight.mdsal binding-parent 3.0.6
org.opendaylight.mdsal mdsal-artifacts 3.0.6
org.opendaylight.controller mdsal-artifacts 1.9.0-SNAPSHOT
org.opendaylight.netconf netconf-artifacts 1.6.0-SNAPSHOT
org.opendaylight.netconf restconf-artifacts 1.9.0-SNAPSHOT
Migrate poms ietf and iana models dependencies:
org.opendaylight.mdsal.binding.model.ietf
rfc6991-ietf-inet-types 1.2.6-SNAPSHOT
rfc6991-ietf-yang-types 1.2.6-SNAPSHOT
rfc7223 1.2.6-SNAPSHOT
org.opendaylight.mdsal.model ietf-access-control-list 0.13.6-SNAPSHOT
org.opendaylight.mdsal.model ietf-packet-fields 0.13.6-SNAPSHOT
org.opendaylight.mdsal.model iana-afn-safi 2013.07.04.15.6
org.opendaylight.mdsal.binding.model.iana iana-if-type 1.0.6-SNAPSHOT
Change-Id: I2675746b2c3d3202080907e6be0bcc59facce1ed
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Jonas MÃ¥rtensson [Tue, 15 Jan 2019 10:31:23 +0000 (11:31 +0100)]
Fix testing dependency in olm/pom.xml
Change-Id: Ia18a4a725e80bc88c7447d243b3d1f4a078e5776
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>
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>
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>
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>
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>
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>
Guillaume Lambert [Mon, 26 Nov 2018 14:52:20 +0000 (14:52 +0000)]
Merge "OLM unit testing update"