guillaume.lambert [Thu, 22 Aug 2019 15:41:55 +0000 (17:41 +0200)]
fix Databroker deprecated warnings
java classes from org.opendaylight.controller.md.sal package
are now deprecated mostly in favor of package org.opendaylight.mdsal.
Some classes were renamed and some types were modified:
RpcProviderRegistry -> RpcProviderService
addRpcImplementation -> registerRpcImplementation
BindingAwareBroker -> yangtools.concepts.ObjectRegistration
com.google.common.base.Optional -> java.util.Optional
method absent() -> empty()
method fromNullable() -> ofNullable()
toJavaUtil no more needed
Blueprints modified accordingly
JIRA:TRNSPRTPCE-42
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I917fd6f65b0f8c8566a60b2374af688001ae8c8e
guillaume.lambert [Mon, 26 Aug 2019 13:46:04 +0000 (15:46 +0200)]
remove some olm Junit
to ease Databroker migration
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I39fd0893bd82c0bda4ded7474f6c3eec1dbdc292
Shaaban Ebrahim [Tue, 27 Aug 2019 15:56:35 +0000 (17:56 +0200)]
add unit test for PowerMgmtImpl
Signed-off-by: Shaaban Ebrahim <shaaban.altanany@gmail.com>
Change-Id: Icb1c1f8f53bdd47b418c14fd959f23bb546b157a
Shaaban Ebrahim [Sun, 25 Aug 2019 15:07:34 +0000 (17:07 +0200)]
add test class for DeviceRendererRPCImpl class
add 5 test cases for DeviceRendererRPCImpl to increase test coverage percentage
Signed-off-by: Shaaban Ebrahim <shaaban.altanany@gmail.com>
Change-Id: Id709432286927831d2b4c343babbfb84a8cd8e92
Ahmed Abbas [Sun, 25 Aug 2019 13:31:59 +0000 (15:31 +0200)]
add unit test for RendererProvider class
- add UT for init method
Change-Id: Id04e71f93aee90407e006350196650e4ad1aff24
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Shaaban Ebrahim [Wed, 21 Aug 2019 15:38:45 +0000 (17:38 +0200)]
Add test class for OpenRoadmInterface221
- adding 10 test cases for the mentioned class to increase test coverage
Change-Id: I20ff1ad7b9ae7bb94f9489cd45a1b1072444491d
guillaume.lambert [Thu, 22 Aug 2019 13:30:51 +0000 (15:30 +0200)]
remove DeviceTransaction.submit()
now completely replaced by commit()
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5c7fce9b9da12bfd57b6473e724d20c94244fa82
guillaume.lambert [Thu, 22 Aug 2019 13:25:39 +0000 (15:25 +0200)]
switch to DeviceTransaction.commit()
instead of submit which is now deprecated
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I433703bb6535b5064772b2766facc1899d4dff05
guillaume.lambert [Thu, 22 Aug 2019 08:54:53 +0000 (10:54 +0200)]
implements DeviceTransaction.commit()
instead of submit which is now deprecated
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7b37bcf123c8d548660076b441d670feaa233150
guillaume.lambert [Thu, 22 Aug 2019 09:56:44 +0000 (11:56 +0200)]
clean and improve log syntax
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If66be44b65606cfeab26baa05b405d3d6e145235
guillaume.lambert [Wed, 21 Aug 2019 09:18:16 +0000 (11:18 +0200)]
remove NetworkTransactionService.submit()
now completely replaced by commit()
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie6bbdcfb1190dca08534f45e795b0c0a851d4951
guillaume.lambert [Wed, 21 Aug 2019 08:55:53 +0000 (10:55 +0200)]
switch to NetworkTransactionService.commit()
instead of submit which is now deprecated
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Idd15f41a576c1fd13f0c95a0fbea934ef89405e0
guillaume.lambert [Wed, 14 Aug 2019 14:35:15 +0000 (16:35 +0200)]
implements NetworkTransactionService.commit()
that relies on AsyncWriteTransaction.commit()
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1aac9d3af3d28e3d5ebceff2808ee8d90826d353
guillaume.lambert [Wed, 14 Aug 2019 09:56:34 +0000 (11:56 +0200)]
fix some AsyncWriteTransaction.submit warnings
AsyncWriteTransaction.submit() is deprecated and is replaced by commit()
that rely on FluentFuture<? extends @NonNull CommitInfo>
instead of ListenableFuture<Void>.
https://git.opendaylight.org/gerrit/c/netconf/+/71545
https://git.opendaylight.org/gerrit/c/controller/+/71547
https://git.opendaylight.org/gerrit/c/netconf/+/71582
- fix most AsyncWriteTransaction.submit deprecated warnings by replacing
AsyncWriteTransaction.submit by commit
- deprecate NetworkTransactionService, NetworkTransactionImpl
RequestProcessor and DeviceTransaction submit functions that relies on
AsyncWriteTransaction.submit()
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I99689f54a6d41209c38c8a266f3f5226edcda6a6
guillaume.lambert [Wed, 14 Aug 2019 07:49:58 +0000 (09:49 +0200)]
fix CheckedFutures deprecated warnings
com.google.common.util.concurrent.CheckedFuture is deprecated.
Netconf switched to new MD-SAL APIs that rely now on FluentFuture.
https://git.opendaylight.org/gerrit/c/netconf/+/78424
https://git.opendaylight.org/gerrit/c/netconf/+/78425
https://git.opendaylight.org/gerrit/c/controller/+/80412
- switch to FluentFuture or ListenableFuture when possible.
- ReadFailedException removed since not managed by ListenableFuture.
- When mocking MD-SAL APIs, switch to FluentFuture and doReturn().when()
since when().thenReturn() raises an error with FluentFuture.
- checkGet catched by TransactionCommitFailedException replaced by
(Future.)get catched by InterruptedException and ExecutionException
- improve by the way common.network.RequestProcessor logs syntax
TODO: remove makeChecked use from Junit DeviceTransactionManagerTest
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I138268e9a117306107f5a7c30093b7b3132fa9c9
guillaume.lambert [Tue, 13 Aug 2019 14:06:50 +0000 (16:06 +0200)]
fix some deprecated warnings
- org.openroadm.network.topology.rev181130.Node1 getNodeType is
deprecated but not in Node1Builder
- org.jgrapht.alg.shortestpath.KShortestPaths replaced in favor of
KShortestSimplePaths
- writeOrModifyOrDeleteServiceList deprecated method should not raise
any warnings when called by Junit tests -> @SuppressWarnings decorator
- fix org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream
create method
- fix org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory
createSimple and createLazy methods
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I12fc958dfb5d513bdddd288e527f9284eb00dcc9
guillaume.lambert [Mon, 19 Aug 2019 09:42:20 +0000 (11:42 +0200)]
fix ServiceHandler Bug
introduced in previous commit
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iea9773d9ce223de29f0f677cd833efe735918be5
guillaume.lambert [Mon, 12 Aug 2019 09:20:01 +0000 (11:20 +0200)]
fix some sonar issues
identified with the following tags
- clumsy
- convention
- cwe
- misra
- unused
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie1c448e81bbf3439655fa6260bc2052350ed9aeb
Ahmed Abbas [Thu, 8 Aug 2019 08:32:01 +0000 (10:32 +0200)]
fix renderer Junit tests
- fix UT in DeviceRendererServiceImplCreateOtsOmsTest
- fix UT in DeviceRendererServiceImplSetupTest
Change-Id: Ie146bb625f6491aa138152aeba4098c47fded8eb
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
guillaume.lambert [Thu, 8 Aug 2019 09:44:34 +0000 (11:44 +0200)]
fix PCE vulnerabilities identified in sonar
PceConstraints ResourcePair parameters declared as public
instead of private + accessors
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I742bed7656ea3a4d368cad437f0ddc082d6964d8
guillaume.lambert [Wed, 7 Aug 2019 08:05:15 +0000 (10:05 +0200)]
Bump mdsal to 3.0.10
https://git.opendaylight.org/gerrit/c/integration/distribution/+/83129
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9a171ee13b5e969e3a1b62bc4b8c8ce2d73d4dd5
Gilles Thouenon [Wed, 17 Jul 2019 10:00:53 +0000 (12:00 +0200)]
Update end-to-end functional tests
- realign functional tests for device 1.2.1 on the test suite for device
2.2.1 which is more determinist
- add oms attributes in rdm2rdm links in topo in order to take into
account hard constraints in PCE (change 82557)
JIRA: TRNSPRTPCE-109
Change-Id: I92357faa8f6e4d3ed2a38582de3f53cce154a844
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Wed, 17 Jul 2019 13:48:14 +0000 (15:48 +0200)]
Set flex-wave data in topo for roadm-tp
Add frequency and width on wavelength after service creation
JIRA: TRNSPRTPCE-109
Change-Id: Ic5cb226d0d71306e7e93e02c633a8e90092f2112
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Wed, 17 Jul 2019 07:48:07 +0000 (09:48 +0200)]
Update renderer functional tests
To take into acount the new mapping result
JIRA: TRNSPRTPCE-109
Change-Id: I9401e7424f103b1ef3242098cd65a9466d9574da
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Thu, 11 Jul 2019 11:41:50 +0000 (13:41 +0200)]
Topo-PortMapping functional tests
- simplify the existing functional test suite for device 1.2.1
- create equivalent functional test suite for device 2.2.1
JIRA: TRNSPRTPCE-109
Change-Id: I3154530b44577c95d970aca170bce22568c71180
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Tue, 9 Jul 2019 13:39:21 +0000 (15:39 +0200)]
Update topology functional tests
- realign topology functional tests for device 1.2.1 on functionnal
tests for device 2.2.1
- add new check on associated-tp for xpdr termination points
JIRA: TRNSPRTPCE-109
Change-Id: I63d39e307030ec8fb58173e7d4191eb71fe8ad4c
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Mon, 8 Jul 2019 14:04:58 +0000 (16:04 +0200)]
Update portmapping functional tests
Tests the new portmapping hierarchy with node-info
JIRA: TRNSPRTPCE-109
Change-Id: I6dcf4da32a55f2af7d3ea0768757a8ad52e3dc22
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Fri, 5 Jul 2019 09:43:57 +0000 (11:43 +0200)]
Backport portmapping for device 221 to device 121
Allows to have exactly the same treatment for 1.2.1 and 2.2.1 devices
JIRA: TRNSPRTPCE-109
Change-Id: Ied73a5bdd70de4f5f49341f67646a01df6cd2f84
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Wed, 3 Jul 2019 12:52:55 +0000 (14:52 +0200)]
Add node-info in portmapping structure
- change structure of portmapping.yang to put general node info in a
new node-info container that serves to create node in different
network layers (openroadm-cli, openroadm-network, openroadm-topology)
without multiple readings inside device
- adapt code to the new portmapping structure (especially, to get the
node-version)
- remove MappingUtils from PortMappingImpl, olm and renderer unitary
tests
- remove opeenRoadmTopology121 implementation since there is no longer
any device transaction needed to built node/link in openroadm-topology
(only from portMapping)
- disable some renderer UT
JIRA: TRNSPRTPCE-109
Change-Id: Ifa475029c73cb0690ea18d9903b9dead5f0d57f1
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Tue, 2 Jul 2019 13:58:33 +0000 (15:58 +0200)]
Consolidate portmapping
- creation of logical-connection-point for DEG and SRG roadm-external
ports by TransportPCE, from device configuration datas, when
configuration is relevant
- for unidirection ports, check their consistency before lcp creation,
using among other things partner-port information
- for XPDR, partner port is added in portmapping through partner-lcp.
For ROADM, partner ports are distinguished with lcp-termination (TX or
RX)
Change-Id: Ifef902281d8b5fb27c7296587aad63c634f4bf85
JIRA: TRNSPRTPCE-109
JIRA: TRNSPRTPCE-117
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Fri, 28 Jun 2019 15:59:51 +0000 (17:59 +0200)]
Consolidate portmapping-topo for ROADM
- create RDM node in openroadm-topology from its portmapping data only
- change the way to create links
JIRA: TRNSPRTPCE-109
Change-Id: Ie2790fa7f13a29f6dc67e7491e86d808b29159c8
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Wed, 26 Jun 2019 08:15:26 +0000 (10:15 +0200)]
Consolidate portmapping-topo for XPDR
- add port-dir, port-qual, associated-lcp in XPDR portmapping
- for XPDR, associated-lcp depends on data of device/connection-map
- create XPDR node in openroadm-topology from its portmapping data only
(no longer from device data)
- add new tpce augmentation for node tps in openroadm-topology in order
to put associated-lcp info
- add yang file for transportpce augmentation
- deactivate E2E 2.2.1 functional tests in releng
timelimit hit and test broken by YANG deviation support pb
JIRA: TRNSPRTPCE-109
Change-Id: I8482077cd1fdc25822f668c2b75769c9df95a70a
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Ahmed Abbas [Tue, 30 Jul 2019 14:12:49 +0000 (16:12 +0200)]
add unit tests for serviceHandlerProvider class
- test that init method registers ServiceHandler to rpcRegistery
Change-Id: I29d8aacb1e539bd0e951f18f74b5b94b5e430f55
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Ahmed Abbas [Thu, 25 Jul 2019 07:51:22 +0000 (09:51 +0200)]
add unit tests for DowngradeConstraints
- add UT for updateSoftConstraints method
- add UT for downgradeHardConstraints method
- add UT for convertToSoftConstraints method
Change-Id: I419385d617adb39c87807acc35ef5d0fb2147562
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Ahmed Abbas [Wed, 24 Jul 2019 17:19:27 +0000 (19:19 +0200)]
fix two issues in ServiceHandlerImpl
- remove duplicate call to performPCE
- return false on NullPointerException in validate service creation
Change-Id: Ia87f913009f20a0e85b91cef709f555ade72b5a7
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
shweta [Tue, 18 Jun 2019 17:12:49 +0000 (13:12 -0400)]
PCE update to support constraints
- PCE Library update
- Constraints
- restructuring of code
- add oms-attributes to the topology config files for functional tests
JIRA: TRNSPRTPCE-95
Change-Id: I711b1cf9bae4fa8c4c2029486776ebc00ed411a2
Signed-off-by: shweta <sv111y@att.com>
shweta [Wed, 3 Jul 2019 16:16:36 +0000 (18:16 +0200)]
modify pce module folder structure
Change-Id: Ie63730dd7c1a228aa73e65291325f36eef086b04
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 23 Jul 2019 08:46:45 +0000 (10:46 +0200)]
fix some javadoc warnings
@throw statement must be after @return
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I753f5aa9d156fde0121e31abba12e881bd401525
Ahmed Abbas [Wed, 17 Jul 2019 20:19:49 +0000 (22:19 +0200)]
add unit tests for ServicehandlerImpl
- UT for serviceReroute
- UT for tempServiceCreate
- UT for tempServiceDelete
Change-Id: If132c8821390dff45a41a5cc202e98c406acaac8
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Bhardwaj, Dhruv (db929a) [Thu, 6 Jun 2019 13:59:30 +0000 (09:59 -0400)]
Add bug fixes for 2.2.1 devices
1. Change calculation for mapping wavelength number to frequency
and bandwidth.
2. Add check for port qualifier to avoid NPE
3. Add conditional statement to prevent mc creation on SRG
4. Change order of mc and nmc creations
5. Modify functional tests suite rspn221 and olm accordingly
JIRA: TRNSPRTPCE-130
Change-Id: I7050f7ff1fdb8d5f2c36b98ad89cd4e363ba10c2
Ahmed Abbas [Wed, 3 Jul 2019 18:10:30 +0000 (20:10 +0200)]
serviceReconfigure and serviceRestoration UT
Change-Id: I6f7ab5e1a9023d2fc475a58d364ed987e8d287e1
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
Ahmed Triki [Tue, 2 Jul 2019 13:30:33 +0000 (15:30 +0200)]
add oms attributes to the topology functional test
- add the oms attributes to all the ROADM-to-ROADM links
- each link contains one span with a predefined engineered spanloss
JIRA: TRNSPRTPCE-95
Change-Id: Ib8af529390871b5fd65de48c1ad61305b23a44e6
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
guillaume.lambert [Fri, 5 Jul 2019 12:35:25 +0000 (14:35 +0200)]
Bump upstreams to the new Neon SR2 versions
- odlparent to 4.0.11
- mdsal to 3.0.9
- yangtools to 2.1.11
https://git.opendaylight.org/gerrit/#/q/status:merged+project:integration/distribution+branch:stable/neon+topic:mri-neon-sr2
Change-Id: I21fae1d5318df253fd18cbccbf3aad08fb4e15af
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Wed, 3 Jul 2019 14:28:54 +0000 (14:28 +0000)]
Merge "Remove code deleting node from clli network"
Guillaume Lambert [Tue, 2 Jul 2019 14:35:45 +0000 (14:35 +0000)]
Merge "Minor changes in the topology extraction for GNPy"
Gilles Thouenon [Tue, 2 Jul 2019 13:28:39 +0000 (15:28 +0200)]
Remove code deleting node from clli network
- it is not relevant to remove a clli-node from clli-topology.
Change-Id: Iec84b639041713c7e11f38031267c9a861110c19
JIRA: TRNSPRTPCE-115
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Ahmed Triki [Fri, 28 Jun 2019 17:07:51 +0000 (19:07 +0200)]
create json files for GNPy functional tests
- put topology descriptions in json files
(instead of directly in the script)
- those json files describe the clli, openroadm and openroadm network
topologies, that are needed to generate the GNPy topology.
- These sample configs contain two transponders and three ROADMs
- The oms attributes are considered for ROADM-to-ROADM links.
JIRA: TRNSPRTPCE-131,TRNSPRTPCE-95
Change-Id: Ia06aa0db56049759ea43a2bf8603f2ede318b7f2
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
Ahmed Triki [Fri, 28 Jun 2019 07:54:37 +0000 (09:54 +0200)]
Minor changes in the topology extraction for GNPy
-Compute the loss coefficient based on the length of span and
the span loss
-Fixing the AttIn to zero as this metric is not supported by T-PCE
JIRA: TRNSPRTPCE-87
Change-Id: If91fea8781c576083c306e5f115b31a0386c2ffb
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
Ahmed Triki [Mon, 24 Jun 2019 16:07:43 +0000 (18:07 +0200)]
GNPy functional tests
create a test python script for GNPy that performs the following steps:
- mount clli-topology, openroadm-network and openroadm-topology
- oms-attributes are added in the description of openroadm-topology
- test the gnpy-response in the output of transportpce-pce:path-
computation-request
- unmount the topologies
modify tox.ini to add the corresponding gnpy profile (not launched in
releng) to additionally :
- retrieve the GNPy REST server docker image on dockerhub if needed
- run the docker image
- maps the container port 5000 to localhost:8008
because 5000 is a default port already used by Jenkins
and 8008 is an official alternate HTTP port
changes GNPy server port harcoded in project code from 5000 to 8008
JIRA: TRNSPRTPCE-131
Change-Id: I68211b31bdb65a4491f456ac78838d9f02ca8a92
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
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>