guillaume.lambert [Tue, 11 Feb 2020 17:08:45 +0000 (18:08 +0100)]
reformat API YANG models
using pyang version 2.1.1
with --yang-canonical option
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7bf772bf79fd6833009bb57037892ebeb80bf2b0
Olivier Renais [Mon, 10 Feb 2020 21:26:48 +0000 (22:26 +0100)]
Upgrade to Service Path 1.7
JIRA: TRNSPRTPCE-178 TRNSPRTPCE-196
Signed-off-by: Olivier Renais <olivier.renais@orange.com>
Co-authored-by: Shweta Vachhani <sv111y@att.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iefadc5477fc23e59e2b8f86c441e0165a329f63e
Gilles Thouenon [Thu, 30 Jan 2020 07:01:50 +0000 (08:01 +0100)]
Adapt PCE code for OTN services
Allows pce code to calculate paths for OTU4, ODU4 structured for LO-ODU,
10GE and 1GE services, provided that the otn-topology contains correct
information for links and otn-nodes/tp.
- add PceNode interface, and use PceOpticalNode and PceOtnNode as two
different implementations of PceNode interface
- review implementations of chooseTribPort, chooseTribSlots methods in
PostAlogPathValidator
JIRA: TRNSPRTPCE-162 TRNSPRTPCE-201
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Id7105571691e9513dff6ca41cd1287f351f35de9
Olivier Renais [Wed, 23 Oct 2019 13:29:13 +0000 (15:29 +0200)]
PCE OTN layer support init
-Add PceOtnNode Class and complete PceLinkClass
-Add Algorithm in PceCalculation and PceGraph to handle path
calculation at the WDM or OTN layer
-Adapt InAlgoPathValidator to work with the OTN layer
-Adapt PostAlgoPathValidator with method to retrieve trib-port/slot in
place of wavelengths
CAUTION: at that time, it does not handle trib-slot and trib-port
pass to Service Handler (still based on old path-computation-request)
-Adapt PCE functional tests
-change topo to include supporting nodes
CAUTION: Expected node in rpc path-computation-request is of OTN type
JIRA: TRNSPRTPCE-162
Signed-off-by: Olivier Renais <olivier.renais@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: If5c29cae48b94660f2536f86b2df814b6515969b
atriki [Thu, 12 Dec 2019 14:27:36 +0000 (15:27 +0100)]
Consolidation of the PCE
- change k from 10 to 100 in the case of nodes inclusion in the hard
constraints and in the case when a first execution of k-shortest-path
failed
- conslidate the osnr calculation
- add the OUT_OF_SPEC_OSNR as a cause of path computation failure
- add the HD_NODE_INCLUDE as a cause of path computation failure
- detect TOO_HIGH_LATENCY in the case where the MaxLatency is exceeded
- Verfication of MaxLatency and node inclusion violation in
postAlgoPathValidator instead of inAlgoPathValidator
- change the name of the method calcPath() of PceCalculation to
retrievePceNetwork()
JIRA: TRNSPRTPCE-146, TRNSPRTPCE-147, TRNSPRTPCE-93
Change-Id: Ie2f8bf502af81de857dadbdc5a879f5c4b10c96b
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
Guillaume Lambert [Mon, 3 Feb 2020 15:53:00 +0000 (15:53 +0000)]
Merge "Consolidation of the GNPy module"
atriki [Wed, 8 Jan 2020 09:51:52 +0000 (10:51 +0100)]
Consolidation of the GNPy module
- add GnpyException to manage unexpected events
- expand the 32-bit identification field of fibers to range
from 243.0.0.1 to 243.255.255.255
- expand the 32-bit identification field of EDFAs to range
from 244.0.0.1 to 244.255.255.255
(the 32-bit identifiers are not ipv4 addresses but use the same
dotted-decimal notation. This format is imposed by GNPy yang model to
comply with the IETF recommendations and to be compliant with planning
tools coming from the IP world.)
- code refactoring
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
Change-Id: Ifa41c68874b8d87abe746cd6c1b87ee950131a32
guillaume.lambert [Wed, 29 Jan 2020 14:57:05 +0000 (15:57 +0100)]
fix tox docs profiles
- fix ODL version in docs/conf.yaml
- fix base-python version in tox.ini to use any python3 version.
(better compatibility with potential new requirements)
- reactivate docs and docs-linkcheck profiles
they only work with python 3.6 in releng at that day
(because of current lfn-tools requirements)
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7589b3f52c1f6d9f3c996566d59b861192de2c46
Gilles Thouenon [Mon, 27 Jan 2020 14:29:41 +0000 (15:29 +0100)]
Fix issue in end2end functional tests
fix and reactivate test 33
JIRA: TRNSPRTPCE-177
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I77b1d3654870e278232ec725d33fed07f59420ef
Gilles Thouenon [Fri, 17 Jan 2020 10:41:30 +0000 (11:41 +0100)]
Portmapping-topologies code consolidation
Refactor otn-topology code to avoid any access to OpenROADM device
configuration during node creation. To that purpose:
- review code related to all topology layers to use static methods
- add new class OtnNode to help creation of different otn-nodes in
otn-topology
- change code to create otn node in otn-topology distinguishing tpdr,
switch, mpdr
- adapt openroadm-topology to make appear network tp of otn switch/mpdr
nodes
- remove from openroadm-topology tail-equipment-id for xpdr nodes
- adapt pce code consequently
- add tail-equipment-id with ROADM-SRG-PP info on tp of xpdr node when
creating XPONDER-INPUT/OUTPUT links in openroadm-topology
- adapt functional tests consequently to all these modifications
- deactivate test 33 from end2end functional tests since the deletion of
the "tail-equipment-id" from the topology is not fully implemented yet
JIRA: TRNSPRTPCE-177
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Change-Id: I45bb0f06b0bae87af10164addbdedc3ab79dba36
Gilles Thouenon [Fri, 24 Jan 2020 10:28:46 +0000 (11:28 +0100)]
upgrate network topology YANG to introduce OTN
- add openroadm-common-network/otn-topology augmentation
- update revision
- modify code accordingly to support this new revision
JIRA: TRNSPRTPCE-177
Signedff-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Change-Id: Ifbeac6dd6a5ccaf348e82e2fa7afbc2f4dd65e6c
Gilles Thouenon [Fri, 17 Jan 2020 10:38:53 +0000 (11:38 +0100)]
upgrade portmapping YANG to introduce OTN
- add otn data to portmapping YANG model
(odu-switching-pool, supported-interface-capability, xponder-type)
- rename associated-lcp in connection-map-lcp to avoid potential
confusions to come
- update revision
- modify code accordingly to support this new revision
- update tests accordingly
JIRA: TRNSPRTPCE-177
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Change-Id: Ice6c2cff6bb105cb04abdf04b49976daa976571d
guillaume.lambert [Thu, 23 Jan 2020 18:54:53 +0000 (19:54 +0100)]
disable tox docs
job in failure for no apparent reason
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5c24ca22a757b30c8b9474e5cf9f15bfd98dd73d
guillaume.lambert [Thu, 23 Jan 2020 14:42:08 +0000 (15:42 +0100)]
Bump to odlparent-5.0.5/yangtools-3.0.9/mdsal-4.0.11
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I19773c0a0988c01111940e37b9de055118a47e28
Ahmed Abbas [Wed, 15 Jan 2020 01:20:34 +0000 (03:20 +0200)]
fix powerMock and mockito versions mismatch
this was causing failures in OLM PowerMgmtPowerMockTest Junit
and in OlmPowerServiceImplTest that is not completely fixed yet.
JIRA: TRNSPRTPCE-180
Change-Id: I0937f92c63a3999314dcb36ec0b02a65a46d5ff5
Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com>
guillaume.lambert [Fri, 10 Jan 2020 16:15:51 +0000 (17:15 +0100)]
fix javadoc warnings
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic5a9edce2ed0ee0beb887a8b617ea0ef97b478b5
guillaume.lambert [Thu, 9 Jan 2020 14:15:57 +0000 (15:15 +0100)]
fix vulnerability identified by Sonar
JIRA: TRNSPRTPCE-193
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifce9b71e5c9233145188107586428039f38b1c16
Christophe Betoule [Thu, 9 Jan 2020 13:06:12 +0000 (14:06 +0100)]
Cleanup and optimize POM
JIRA: TRNSPRTPCE-181
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3229c20ca0df736a9845a4aa782b80bd6ab02317
guillaume.lambert [Thu, 9 Jan 2020 13:04:35 +0000 (14:04 +0100)]
ignore OLM Junit in failure after upstream changes
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7f150ca3c9540d5c0c728aff13333aec1cca3b73
guillaume.lambert [Tue, 7 Jan 2020 09:47:26 +0000 (10:47 +0100)]
Bump dependencies to newer Sodium SR2 dev versions
org.opendaylight.odlparent * 5.0.3 -> 5.0.4
org.opendaylight.yangtools yangtools-artifacts 3.0.6 -> 3.0.7
org.opendaylight.mdsal binding-parent 4.0.7 -> 4.0.8
org.opendaylight.mdsal mdsal-artifacts 4.0.7 -> 4.0.8
https://docs.opendaylight.org/projects/integration-distribution/en/stable-sodium/platform-versions.html
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4e22d0e9310dbdf4107fb57a1a73b6bb83b38cb5
guillaume.lambert [Fri, 20 Dec 2019 12:48:35 +0000 (13:48 +0100)]
update mvn version in releng tox jobs
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3bcfba300629f7e36871cf50c75e38def82b28ca
guillaume.lambert [Mon, 16 Dec 2019 15:27:31 +0000 (16:27 +0100)]
fix CrossConnect methods implementation warnings
at build time
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I924ed7db04802bb0affda561f0baaf7fa6bf6874
guillaume.lambert [Mon, 16 Dec 2019 10:33:52 +0000 (11:33 +0100)]
un-deprecate common device getDeviceMountPoint
This method has been introduced already deprecated because it was
relying on the old md.sal controller API.
Since we use now the new MD-SAL API, there is no reason to keep it
deprecated.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I0fe318138e3d88177be0344ff9714ad2b7eb4af1
guillaume.lambert [Fri, 13 Dec 2019 15:44:53 +0000 (16:44 +0100)]
remove unchecked cast and conversion warnings
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1c30bbcc20c1560030a8409dd6c64e02870bf12d
guillaume.lambert [Fri, 13 Dec 2019 14:31:23 +0000 (15:31 +0100)]
fix Junit mockito deprecated warnings
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I71e7cf97afcf8774de2649fd93f5e9c4c4834e7b
guillaume.lambert [Fri, 13 Dec 2019 14:16:52 +0000 (15:16 +0100)]
Remove unchecked warnings from Junit tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1115d54f831001250d94ec5d66232edd21cbda65
Gilles Thouenon [Fri, 18 Oct 2019 13:33:42 +0000 (15:33 +0200)]
fix deprecated openroadm interfaces/objects
Concerns mainly changes on node-type, link-type and tp-type, from
org-openroadm-network-topology to org-openroadm-common-network.
for example getLinkType() in
[].org.openroadm.network.topology.rev181130.Link1 objects
must now be called from
[].org.openroadm.common.network.rev181130.Link1
modify functional tests and sample configurations accordingly
JIRA: TRNSPRTPCE-144
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I04f69ea5507fbc3a76eceb92ec52efcbb5301c4c
shweta [Thu, 21 Nov 2019 14:06:07 +0000 (15:06 +0100)]
Initial code for OTN topology and portmapping
JIRA: TRNSPRTPCE-138
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>
Change-Id: Ie576bf4b90a3ca9a94e7a5152edb86b99281c69e
guillaume.lambert [Mon, 9 Dec 2019 15:50:39 +0000 (16:50 +0100)]
fix mdsal WriteOperations deprecated warnings
Caution:
the warning in Junit renderer TransactionUtils was only annotated since
it cannot be modified without compromising most of the renderer Junit
test suite.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I189ea9c6368936e0eae15bb9c542ad60575d9c2d
guillaume.lambert [Fri, 29 Nov 2019 15:06:20 +0000 (16:06 +0100)]
Deprecate some write operation functions
In org.opendaylight.mdsal.binding.api.WriteOperations, put and merge
methods with createMissingParents boolean parameter are now deprecated.
Derived functions in transportpce shall repercute this deprecation.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I36fb5907c0e4c6b2e81b78c80d325b4593107fee
guillaume.lambert [Fri, 29 Nov 2019 16:05:03 +0000 (17:05 +0100)]
remove mdsal StreamWriterGenerator
org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator
is now deprecated
Binding context can be given to the BindingNormalizedNodeCodecRegistry
class builder.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If48c3f8aabe982d59e2675e9d3ba961a5a51f37e
atriki [Wed, 30 Oct 2019 17:55:06 +0000 (18:55 +0100)]
Update functional tests for gnpy
- Mount the clliNetwork, openroadmNetwork and
openroadmTopology
- Test the case where path computed by PCE is not feasible and
Gnpy computes a new one feasible
- Test the case where path computed by PCE is not feasible and
Gnpy cannot find a new one
- Test the case where path computed by PCE is feasible and
Gnpy confirms the feasibility
- Unmount the clliNetwork, openroadmNetwork and
openroadmTopology
JIRA: TRNSPRTPCE-132
Change-Id: If07482af397b419e42f810053e36c894f1668922
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
atriki [Fri, 23 Aug 2019 14:20:21 +0000 (16:20 +0200)]
Supporting new paths computed by GNPy
- In the case where the path is not feasible, PCE asks gnpy to
compute a new path
- The service handler constraints concerning the nodes inclusion
are also transmitted to gnpy
- The PCE verifies the new path and computes the equivalent
openroadm-topology
JIRA: TRNSPRTPCE-49
Change-Id: Icb05209a6e3261dbb2da605f3787a0b48c0aee0a
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
Gilles Thouenon [Wed, 4 Dec 2019 13:13:31 +0000 (14:13 +0100)]
Multi-layer TAPI topology creation for OTN
- implementation of TAPI:get-topology-details rpc to abstract nodes from
OpenROADM otn-topology
JIRA: TRNSPRTPCE-161
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I0f196248002390c7ec5567fd912d6fac2dcb1a91
Gilles Thouenon [Fri, 28 Sep 2018 11:54:55 +0000 (13:54 +0200)]
TAPI topology creation for 100GE Transponder
- implementation of TAPI:get-topology-details rpc to abstract nodes from
OpenROADM openroadm-topology
- TAPI implementation based on models v2.1.2
- expose only one tapi-node, with all 100GE client ports of xpdr as
owned-node-edge-point with a single SIP(Service Interface Point) when
their associated line ports are connected to RDM infrastructure
through XPONDER-INPUT and XPONDER-OUTPUT links
- implement REST API for tapi:service-interface-points to associate
tapi service interface point (SIP) to an OpenROADM service-end-point
JIRA: TRNSPRTPCE-145
JIRA: TRNSPRTPCE-168
Change-Id: I9cafd68e7ab47d33d7e990cd349960357bb4352d
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule.com>
Gilles Thouenon [Mon, 25 Nov 2019 14:57:06 +0000 (15:57 +0100)]
Functional tests for OTN topology
JIRA: TRNSPRTPCE-139
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I4c6e67eff9f1cd8c6c8c9d92167261d7c257a47e
Olivier Renais [Fri, 11 Oct 2019 15:33:58 +0000 (17:33 +0200)]
Configuration with OTN for switch and muxponder
- oper-SPDRAv1.xml contains basic otn configuration
- oper-SPDRAv2.xml contains addition configuration for otn interfaces
JIRA: TRNSPRTPCE-166
Change-Id: Ifd02d0582f058ca4e9c43f406687f61fdf7bbc0c
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Gilles Thouenon [Wed, 13 Nov 2019 11:09:46 +0000 (12:09 +0100)]
Upgrade honeynode 2.2.1 emulator for OTN
- complement device and common 2.2.1 yang models to support
configuration with, among other things, otn functionalities.
- adapt XSLT transforms to start emulator with initial configuration
containing interfaces (ethernet, och, otu, odu)
- clean org-openroadm yang files (trailing spaces)
JIRA: TRNSPRTPCE-137
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I137446b6ff3f8f64db0db2c96b99eee82fb978fd
malick [Wed, 31 Jul 2019 12:44:51 +0000 (14:44 +0200)]
add an Inventory Docker file
based on MariaDB version 10.3
JIRA: TRNSPRTPCE-82
Change-Id: I567c21f2778a388ce3e1fe65ce25834c24dc5a2b
Signed-off-by: malick <malick.sylla@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Thu, 31 Oct 2019 13:01:58 +0000 (14:01 +0100)]
switch inventory to Mariadb
and comment out devices v2.2.1 support
JIRA: TRNSPRTPCE-81 TRNSPRTPCE-82
Signed-off-by: Narayan Padi <np2698@att.com>
Change-Id: Ifa2150a91ee58b8c77cdfbae6721c78bed5f171e
Narayan Padi [Thu, 28 Mar 2019 17:34:18 +0000 (13:34 -0400)]
Inventory init
- creates a new inventory module to store information in an external
MySQL/Mariadb database
- currently supports OpenROADM version 1.2.1 devices
- prepares the support of OpenROADM version 2.2.1 devices
- uses new mdsal Databroker API
JIRA: TRNSPRTPCE-81
Change-Id: I7c2df57d39964bc90dfd475efa4565d51e054822
Signed-off-by: malick <malick.sylla@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 20 Nov 2019 10:33:39 +0000 (11:33 +0100)]
fix some checkstyle warnings
that appeared with dependencies bump
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia48ca0bc6622153c52b76730e6ad50dd20a11b0b
Gilles Thouenon [Wed, 6 Nov 2019 16:39:30 +0000 (17:39 +0100)]
Make the PCE more deterministic
in the choice of SRG node in a RDM, or the choice of the PP port on a
SRG, or the choice of the NETWORK TP on a XPDR.
JIRA: TRNSPRTPCE-169
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7aa2088282aea2a0bcfb6301c09b4aab1c9cb3c6
guillaume.lambert [Mon, 18 Nov 2019 13:55:50 +0000 (14:55 +0100)]
upgrade tox jobs to python 3.5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifb7a1cf945167d9ad2d498e45f9eb5ea9b70db1a
guillaume.lambert [Mon, 18 Nov 2019 14:56:56 +0000 (15:56 +0100)]
Bump dependencies to Sodium SR2
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I57cd6b2720db96b30b2f3766a7a7f2c1defbc835
Gilles Thouenon [Wed, 30 Oct 2019 13:22:41 +0000 (14:22 +0100)]
Change node-id in 1.2.1 functional tests
org-openroadm-service imposes a node-id compliant with
org-openroadm-common-node-types@2018-11-30.
All functional tests and device configuration files for
org-openroadm-device 1.2.1 need to be updated
(node-id must be a string of at least 7 characters...)
JIRA: TRNSPRTPCE-159
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic185e4334b205aeefab599a67ab7b91a45101145
Gilles Thouenon [Tue, 8 Oct 2019 07:21:19 +0000 (09:21 +0200)]
upgrade bundles to openROADM service 5.1.0
adapt code of PCE, renderer and servicehandler
to support the new openROADM service data models
JIRA: TRNSPRTPCE-159
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie41e64f04c067e4bf8d6d3e34e94d781e4e895a8
guillaume.lambert [Tue, 15 Oct 2019 12:32:18 +0000 (14:32 +0200)]
upgrade models to OpenROADM service 5.1.0
- upgrade openROADM service models from 1.2 to 5.1.0
- add related openROADM common models
- adapt transportPCE service path models consequently
- fix revisions in java code
JIRA: TRNSPRTPCE-159
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I035175e5653a1e5ea0fd75c8a1086755e31bc05c
guillaume.lambert [Wed, 16 Oct 2019 12:49:51 +0000 (14:49 +0200)]
remove tpce service-path 1.5 models
JIRA: TRNSPRTPCE-160
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9b9ff7709a26597636a40d3dd6a8563244816e69
guillaume.lambert [Thu, 17 Oct 2019 09:03:15 +0000 (11:03 +0200)]
remove Junit tests using service-path 1.5 models
JIRA: TRNSPRTPCE-160
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8aacee9742bdfcc2bbacef281094cc789570c62d
guillaume.lambert [Tue, 22 Oct 2019 08:41:28 +0000 (10:41 +0200)]
clean gnpy tox profile and OpenRoadmTopology22
fix gnpy tox profile:
- olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java
does not need to be patched when only the gnpy profile is called.
- the gnpy container must be killed after tests to avoid potential
problems with others tests to run.
clean networkmodel/[..]/util/OpenRoadmTopology22.java from superflous
call to builders.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I51774cd0aaf16f0604a35993e2e9711930539bc7
guillaume.lambert [Tue, 15 Oct 2019 09:13:28 +0000 (11:13 +0200)]
explicit switch/case fallthroughs with a comment
The maven checkstyle plugin allows to comment explicitly fallthrough in
switch/case structures so that they do not raise a warning.
https://checkstyle.sourceforge.io/apidocs/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.html
Replace the @SuppressWarnings decorator by such a comment
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I80f45d149eef2f234ec40044ee4c7f8193df646a
Samuel Kontris [Wed, 18 Sep 2019 14:07:28 +0000 (16:07 +0200)]
Bump lighty.io core and add tests support for it
lighty-core version bumped to current master branch = 12.0.0-SNAPSHOT
This branch is aligned with ODL magnesium but seems to work as well with
TransportPCE current dependencies based on Sodium.
As a result, removing deviations from Openroadm models is no more
required to pass E2E tests.
How to run tests with lighty.io:
1. set environment variable "USE_LIGHTY" to value "True"
2. start any tox tests
The example script tests/tox-lighty-e2e.sh can be used to start
end2end221 tests based on lighty.io TransportPCE version
JIRA: TRNSPRTPCE-126 TRNSPRTPCE-127
Change-Id: I856b69eb9c0a20c3b0b0ece1d9ecb704cd9a272a
Signed-off-by: Samuel Kontris <samuel.kontris@pantheon.tech>
Shaaban Ebrahim [Wed, 2 Oct 2019 18:09:38 +0000 (20:09 +0200)]
Add PowerMock library in OLM module
-add dependecies to OLM module
-fix issues related to these changes in OLM
-add class PowerMgmtPowerMockTest as POS and for increasing test coverage too
Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com>
Change-Id: I3ceb2d32a3cf80925aa029bbf48e8097759fea19
guillaume.lambert [Wed, 2 Oct 2019 08:48:01 +0000 (10:48 +0200)]
disable docs-linkcheck tox jobs
currently broken in releng
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I884d3791e2530423532243ba76beda5de167fe95
Gilles Thouenon [Mon, 23 Sep 2019 14:21:36 +0000 (16:21 +0200)]
Solve issue for testCalculateSpanlossBase
Show example of unitary test on the calculateSpanlossBase method from
OlmPowerServiceImpl.java.
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I1e2003981faffdd6a3558b131633a0589f769188
Gilles Thouenon [Tue, 24 Sep 2019 08:37:25 +0000 (10:37 +0200)]
Update pom dependencies
align org.opendaylight.controller and org.opendaylight.netconf
dependencies on sodium SR1
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I55ac9a4da0e7dd7ad316b4374835216dcbe4717d
Gilles Thouenon [Fri, 20 Sep 2019 07:25:39 +0000 (09:25 +0200)]
Bump project version
for the next release
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I560d694913361eec68e12742066b495d08ca5903
Samuel Kontris [Wed, 18 Sep 2019 12:42:26 +0000 (14:42 +0200)]
Add missing models to lighty.io controller
Signed-off-by: Samuel Kontris <samuel.kontris@pantheon.tech>
Change-Id: I0316d0f163bb91d184c8fc004b63d54f388d63bd
Samuel Kontris [Tue, 17 Sep 2019 11:55:42 +0000 (13:55 +0200)]
Bump lighty.io version
lighty.io 10.0.1-SNAPSHOT to 11.0.0-SNAPSHOT
Signed-off-by: Samuel Kontris <samuel.kontris@pantheon.tech>
Change-Id: I8ee4f92fc830e201de731285b2b40e5661a2bdec
guillaume.lambert [Wed, 11 Sep 2019 12:29:13 +0000 (14:29 +0200)]
fix lighty.io runtime problem
This reverts commit
c01f872ae4f81bee2c61a4a4d600b4e0cbadbaf8
"build lighty.io with ordm4.1 models deviations"
lighty.io build with deviations was fixed in this commit. Although, they
still trigger an error at runtime, that prevents the REST server from
launching correctly.
Change-Id: Ifb15e8877afcd3cf5d10f98b160b9449a2ec704a
guillaume.lambert [Tue, 10 Sep 2019 12:31:13 +0000 (14:31 +0200)]
update lighty.io build
update TransportPCEImpl to use latest MD-SAL Databroker
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I83427f032d4e492c3f5b35a8f7fb2cc9c15c5a86
guillaume.lambert [Tue, 10 Sep 2019 10:01:51 +0000 (12:01 +0200)]
docker support for OpenROADM 2.2.1 sims
- rename 1.2.1 / 2.1 docker files and scripts
- create 2.2.1 docker files and scripts
- rationalize ports used by sims in 1.2.1 functional tests
- improve start scripts
NB: sims 2.1 implements OpenROADM device version 1.2.1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id8ad87dae4431da8aa897a0aaf494b7436fdb80f
Shaaban Ebrahim [Thu, 5 Sep 2019 07:47:14 +0000 (09:47 +0200)]
add some unit test for omlpowerservice
Signed-off-by: Shaaban Ebrahim <shaaban.altanany@gmail.com>
Change-Id: I6423aa73bbabfa7eb1956cae6f1dddcef1170522
Guillaume Lambert [Wed, 4 Sep 2019 12:53:59 +0000 (12:53 +0000)]
Merge "Update Fixed to flex mapping"
Balagangadhar Bathula [Thu, 29 Aug 2019 20:25:21 +0000 (16:25 -0400)]
Update Fixed to flex mapping
1. Updated the formula for converting the wavlength number to start,
stop and center frequency.
2. Fix Test cases to match Common/org-openroadm-wavelength-map.txt file
in 1.2.1 and 2.2.1 openroadm yang models.
Change-Id: Ieb4c9fd59a3af5bbee3169c7b4b0bf72c9d20c1a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Tue, 3 Sep 2019 16:04:18 +0000 (16:04 +0000)]
Merge "fix tox jobs in releng"
guillaume.lambert [Tue, 3 Sep 2019 15:39:58 +0000 (17:39 +0200)]
fix tox jobs in releng
- maven 3.6.0 no more available from apache repo
upgrading to 3.6.2
- unforce success in end2end tox jobs
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I414525d7456a3db140d8a5bd7250b070340416d1
guillaume.lambert [Tue, 3 Sep 2019 08:54:23 +0000 (10:54 +0200)]
fix jgrapht dependencies version
third party component dependencies should not use SNAPSHOT versions
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibf8823955f32c778be4753f07087cf6812e45dda
Guillaume Lambert [Mon, 2 Sep 2019 15:11:55 +0000 (15:11 +0000)]
Merge changes from topic "sodium"
* changes:
remove SH Junit tests affected by Sodium Bump
fix Sodium bump runtime problems
fix Sodium bump build problems
Bump to Sodium
guillaume.lambert [Mon, 2 Sep 2019 08:47:19 +0000 (10:47 +0200)]
remove SH Junit tests affected by Sodium Bump
PceListenerImplTest and RenrederListenerImplTest Junit seems to fail
after Sodium Bump. Although, E2E functional tests are still OK.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I41ac2e7a506d37ed79d24b000e4967fe5afde2de
guillaume.lambert [Mon, 12 Aug 2019 14:44:48 +0000 (16:44 +0200)]
fix Sodium bump runtime problems
- mdsal/mdsal-model-artifacts replaced by mdsal/mdsal-artifacts
- unforce org.opendaylight.mdsal.binding.model.ietf version
- clean pom properties accordingly
JIRA: TRNSPRTPCE-135
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie7244f7b25447ff6e71f61ab84d705dd87692a50
guillaume.lambert [Wed, 7 Aug 2019 14:56:45 +0000 (16:56 +0200)]
fix Sodium bump build problems
- fix Neon deprecated methods removed in Sodium
- use ListenerRegistry.getRegistrations() instead of Iterable manner
- autogenerated classes accessor getImplementedInterface() replaced by
implementedInterface()
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I87283fdacd647a26f11e74e88a8717e0961533cc
guillaume.lambert [Wed, 7 Aug 2019 13:41:32 +0000 (15:41 +0200)]
Bump to Sodium
- odlparent to 5.0.1
- mdsal to 4.0.4
- yangtools to 3.0.4
- controller to 1.10.0-SNAPSHOT
- netconf to 1.7.0-SNAPSHOT
- restconf to 1.10.0-SNAPSHOT
https://wiki.opendaylight.org/view/Sodium_platform_upgrade
- JSR305 explicitly added in poms to use javax.annotation.Nullable
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id167a8770bc33c4782bdc20c69e4f56d3770e0e6
Guillaume Lambert [Thu, 29 Aug 2019 13:36:38 +0000 (13:36 +0000)]
Merge changes I66f5e0aa,I2aa60123
* changes:
Fix lighty.io compilation issues
build lighty.io with ordm4.1 models deviations
Juraj Veverka [Thu, 1 Aug 2019 13:46:28 +0000 (15:46 +0200)]
Fix lighty.io compilation issues
remove OpenRoadm Topology 1.2.1 no more present in networkmodel bundle
Change-Id: I66f5e0aa5d7d9ab316207abecd91bf06536e2988
Signed-off-by: Juraj Veverka <juraj.veverka@pantheon.tech>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 12 Jun 2019 08:27:41 +0000 (10:27 +0200)]
build lighty.io with ordm4.1 models deviations
JIRA: TRNSPRTPCE-126
JIRA: TRNSPRTPCE-127
Change-Id: I2aa6012375c0c7e571d37c1d5a197bf8ab772c9e
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
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>
Code Review / transportpce.git / log