Guillaume Lambert [Thu, 30 Apr 2020 13:37:24 +0000 (15:37 +0200)]
update portmapping YANG to store SAPI/DAPI hashmap
- add a leaf lcp-hash-val to transportpce portmapping YANG
- update revision date
- update java imports with new revision date
JIRA: TRNSPRTPCE-183
Co-authored-by: Shweta Vachhani <sv111y@att.com>
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I7d7df6b2e0003267269045e311ddb18dfe17252d
ShaabanEltanany [Sun, 3 May 2020 13:27:03 +0000 (15:27 +0200)]
add pceOtnNodeTest class
JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I72860d61cd9a453982cd7634631652fc3950bc9b
Guillaume Lambert [Wed, 8 Apr 2020 07:45:54 +0000 (09:45 +0200)]
update lighty.io build for Magnesium support
- update lighy-core branch to 12.1.x
- update dependencies version to 12.1.0
- update functional tests to use lighty executable version 12.1.0
- JAVA 11 support: disable javadoc to allow building directly
without setting the JAVA_HOME variable
- add transportpcer-networkmodel new dependency
- fix tpce java Main class and utils class
TODO: centralize lighty version configuration
add tapi and inventory support
fix functional tests with lighty
JIRA: TRNSPRTPCE-237
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Co-authored-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Icec9547f5ead4e0abc10cdb67e2e8d8e6055a4ec
guillaume.lambert [Wed, 29 Apr 2020 08:17:47 +0000 (10:17 +0200)]
fix some minor issues
- ordmodels/device/pom.xml doppelganger
- tox olmUtils patch persistence
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I41007a636644275a23db3efe8a094dfe4bf763b2
guillaume.lambert [Wed, 29 Apr 2020 14:49:38 +0000 (16:49 +0200)]
fix PCE SpotBugs issues
- add a SuppressFBwarning decorator on classes with false positives
- remove uncalled private methods
- enforce SpotBugs at build time in PCE pom.xml
JIRA: TRNSPRTPCE-244
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1c2f7e8ec1b8cd9994641d31a004733e5d77c272
AhmedEldeeb50 [Wed, 29 Apr 2020 15:15:19 +0000 (17:15 +0200)]
add PcePathDescription Test
JIRA: TRNSPRTPCE-209
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: Ic9448f6d551749fe70b0ceee6a403acd4a6c7c9e
ShaabanEltanany [Mon, 27 Apr 2020 09:09:48 +0000 (11:09 +0200)]
add unit test for pceLink and pceOpticalNode
JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I5f157556e489d7ae9ab749934a56b6483606615f
AhmedEldeeb50 [Sun, 26 Apr 2020 14:07:59 +0000 (16:07 +0200)]
update PceLink test object and NetworkService
JIRA: TRNSPRTPCE-209
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: If3d8ba209f1f4e1ca91f8b19d3e6e9f5a4ecf212
guillaume.lambert [Mon, 27 Apr 2020 16:04:06 +0000 (18:04 +0200)]
fix import extra separations
This new checkstyle rule is now enforced by the releng merge job.
JIRA: TRNSPRTPCE-235
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5e9f0ed9e8c0c3fa6db6fa8d27b6f460aab75972
guillaume.lambert [Mon, 27 Apr 2020 14:02:04 +0000 (16:02 +0200)]
update Mg SR1 kernel dependencies dev versions
These versions have been updated at
https://docs.opendaylight.org/projects/integration-distribution/en/stable-magnesium/platform-versions.html
JIRA: TRNSPRTPCE-235
Change-Id: I7f9cc2f79e6051811ccb773bb56020731b40b911
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Thu, 2 Apr 2020 11:46:57 +0000 (13:46 +0200)]
Align OTN renderer on OTN PCE and update otn-topo
- add dependency towards network module to request NetworkModelService
methods
- service-path rpc allows creation/deletion of OCH and OTU4 interfaces
and updates otn-topology with OTU4 links
- otn-service-path rpc allows creation/deletion of ODU4 interfaces,
structured for otn low order service, and creation/deletion of otn low
order services. Moreover, it creates/updates/deletes consequently otn
links and ODU4 termination points in otn-topology (bandwidth
parameters, tributary slot and tributary port availabilities...)
- adapt otn-renderer functional tests to take into account new behavior
JIRA: TRNSPRTPCE-218
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I85020faf75fa53be1f965becccdf2787f6c743bb
Gilles Thouenon [Thu, 2 Apr 2020 07:53:30 +0000 (09:53 +0200)]
Update otn-topology with otn-links
Adds and implements new methods in NetworkModelService and
OpenRoadmOtnTopology to create, update and delete otn links. These
methods are intended to be used by renderer module after otn interfaces
and odu connections have been correctly configured in otn devices.
JIRA: TRNSPRTPCE-199
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ieba5a6491b4fe0c8617e63a816254c26b051640f
Guillaume Lambert [Fri, 17 Apr 2020 07:45:20 +0000 (09:45 +0200)]
add a pylint tox profile for functional tests
- declare the pylint profile in tox.ini testenv.
- disable missing-docstring check
- set maximum line length check to 120 characters (ODL standard)
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I673cd8be50831fb0ea934a2b1ede6d64650613cd
Abdelmuhaimen Seaudi [Wed, 22 Apr 2020 12:52:50 +0000 (05:52 -0700)]
adding PceOpticalNodeTest Class
JIRA: TRNSPRTPCE-209
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I562fff729aadfede3f9b04a7ac6a8b612f5abead
Guillaume Lambert [Wed, 22 Apr 2020 12:32:56 +0000 (12:32 +0000)]
Merge "add tests for impl layer pce module"
ShaabanEltanany [Wed, 22 Apr 2020 10:25:25 +0000 (12:25 +0200)]
add tests for impl layer pce module
JIRA TRNSPRTPCE-209
Signed-off-by: guillame.lambert <guillaume.lambert@orange.com>
Change-Id: I842c0281795613248cb20ff76057358baeefd42a
AhmedEldeeb50 [Wed, 15 Apr 2020 18:28:52 +0000 (20:28 +0200)]
Fix previous and add new PCE Junit test cases
- add unit tests for PceLink
JIRA TRNSPRTPCE-209
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: I01b5c172481f56691f1ef8dc17837354262154b7
Guillaume Lambert [Fri, 17 Apr 2020 08:46:09 +0000 (10:46 +0200)]
improve functional tests pylint score
- run autopep8
- fix some issues reported by pylint
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I74d797d82dff3690d4c1a372d5a1510b66c1f610
Guillaume Lambert [Fri, 17 Apr 2020 09:28:58 +0000 (11:28 +0200)]
add an autopep8 tox profile for functional tests
- declare the autopep8 profile in tox.ini testenv to autoformat
functional tests python scripts
- set maximum line length check to 120 characters (ODL standard)
- set recursive and in-place options so that the whole tests directory
is automatically autoformatted
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I207fca299babe79c1196a54d09633414b8f86ece
manuedelf [Thu, 26 Mar 2020 21:40:19 +0000 (22:40 +0100)]
Tests suite: fullpath for scripts and config files
- one variable for honeynode executable absolute path
- one variable for sample config absolute path directory
- improve PEP8 code-style: remove unused imports, fix line indents,
line length (<=80) and other minor changes.
Signed-off-by: manuedelf <emmanuelle.delfour@gmail.com>
Change-Id: Icfaefce20673ab776f2ae3b47ea6226e2472d20b
guillaume.lambert [Thu, 16 Apr 2020 07:12:13 +0000 (09:12 +0200)]
Bump dependencies to Mg SR1 dev versions
Those versions can be retrieved at
https://docs.opendaylight.org/projects/integration-distribution/en/stable-magnesium/platform-versions.html
JIRA: TRNSPRTPCE-235
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I46aa659ca4916ef5258bc4e0ff017a5fd1afc240
shaaban Altanany [Tue, 31 Mar 2020 08:45:40 +0000 (10:45 +0200)]
adding some pce unit tests and remove ignore from olm class
Change-Id: Id6325fdf47100b4bdc75c5cacd826f18cda12eca
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
guillaume.lambert [Fri, 27 Mar 2020 21:32:57 +0000 (22:32 +0100)]
Improve Honeynode Docker scripts
to allow 1.2.1 and 2.2.1 containers simultaneous use
and make it the default behaviour
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I200ebfe108c358181d9f28a96109758f33da4fb9
atriki [Wed, 11 Dec 2019 13:57:57 +0000 (14:57 +0100)]
Update config files and tests
- correct the ip-Addresses in some config files
- consider different clfi for different fibers
- move the opposite-link, TE-metric and clfi fields to
org-openroadm-common-network instead of
org-openroadm-network-topology:OMS-attributes
JIRA: TRNSPRTPCE-95
Change-Id: I77aa2130b56eb82157e4edce206aea73711ae497
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
Susmitha [Fri, 20 Mar 2020 15:29:33 +0000 (11:29 -0400)]
default transponder power level
Set transponder power level to default
when SRG Rx power range does not exist
JIRA: TRNSPRTPCE-89
Change-Id: I5d916e7a70be84e5a52360433fbd8c173091c909
Susmitha [Fri, 20 Mar 2020 17:10:43 +0000 (13:10 -0400)]
Calculate spanloss crashes when OTS is not present
-OTS interface check is added to avoid the crash
JIRA: TRNSPRTPCE-172
Change-Id: Ic8fa52eaf98069d7fe581d2c9b2a9f75cbf0fadd
Christophe Betoule [Mon, 16 Mar 2020 11:59:11 +0000 (12:59 +0100)]
Honeynode Docker refactoring for Java11
Upgrade Docker image generation process to use new Java11 simulators.
Both OpenROADM versions 1.2.1 and 2.2.1 simulators are now using a
same docker image and the same scripts.
This brings the following improvements:
- create a multi-stage docker file to isolate build and run processes
- decrease image size
- use an applicative user in Dockerfile rather than root
- add healthcheck
- expose both netconf and restconf ports
- use the docker option --name to set the name of the container
- rootless container and sudo management for docker command
- centralize most scripts parameters in dockercmd_profile.sh
JIRA: TRNSPRTPCE-239
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Emmanuelle Delfour <emmanuelle.delfour@orange.com>
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I86b47cac0f795c2ac9d1615efa703d8ca87b34e5
manuedelf [Thu, 26 Mar 2020 22:08:44 +0000 (23:08 +0100)]
Honeynode build: MacOS compatibility
- set tarLongFileMode to posix for maven assembly plugin configuration
Signed-off-by: manuedelf <emmanuelle.delfour@gmail.com>
Change-Id: I6de1ca4a637fe9736b9c51cf1c92b699a145b7eb
Gilles Thouenon [Tue, 24 Mar 2020 14:39:47 +0000 (15:39 +0100)]
Fix spotbugs issues in network topologies module
JIRA: TRNSPRTPCE-210 ODLPARENT-226
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7b9928b6ee8ab06db0cc27fdcdfe1aaa4cd2fa80
Gilles Thouenon [Fri, 27 Mar 2020 10:35:41 +0000 (10:35 +0000)]
Merge "Fix spotbugs issues in common module"
Guillaume Lambert [Fri, 27 Mar 2020 07:47:02 +0000 (07:47 +0000)]
Merge "Master branch is now Aluminium"
Christophe Betoule [Wed, 25 Mar 2020 13:05:55 +0000 (14:05 +0100)]
Fix spotbugs issues in common module
JIRA: TRNSPRTPCE-206
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I818d9f1c9cd81d06468f23d36fad14feebf840f5
Gilles Thouenon [Thu, 26 Mar 2020 17:25:48 +0000 (17:25 +0000)]
Merge "Bump project to 2.0.0 and fix feature deployment"
Gilles Thouenon [Thu, 26 Mar 2020 17:19:45 +0000 (17:19 +0000)]
Merge "Fix spotbugs issues of the renderer module"
Gilles Thouenon [Thu, 26 Mar 2020 17:16:57 +0000 (17:16 +0000)]
Merge "Fix spotbugs issues of the PCE module"
Thanh Ha [Thu, 26 Mar 2020 16:39:56 +0000 (12:39 -0400)]
Master branch is now Aluminium
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I6de721957fce018b39fab691ed3577b0f2ad074b
atriki [Thu, 19 Mar 2020 22:26:29 +0000 (23:26 +0100)]
Fix spotbugs issues of the PCE module
Fix issues related to:
- reliance on default encoding
- format and Logger Factory
- unused parameters
- bigDecimal constructor
- comparison operators
- serialization/deserialization issues
- check for null fields
- dead store for local variable
- inner static class
JIRA: TRNSPRTPCE-212
Change-Id: I82838dd72f1e42e434b9062e0166b61d22ff4c6a
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
manuedelf [Mon, 23 Mar 2020 20:40:03 +0000 (21:40 +0100)]
Fix spotbugs issues of the renderer module
Fix following categories:
- NP_LOAD_OF_KNOWN_NULL_VALUE
- PZLA_PREFER_ZERO_LENGTH_ARRAYS
- RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE
- SLF4J_ILLEGAL_PASSED_CLASS
- DM_CONVERT_CASE
- NM_CONFUSING
- SLF4J_FORMAT_SHOULD_BE_CONST
- UPM_UNCALLED_PRIVATE_METHOD
- EC_UNRELATED_TYPES
- NP_ALWAYS_NULL
- NP_LOAD_OF_KNOWN_NULL_VALUE
JIRA: TRNSPRTPCE-213
Signed-off-by: manuedelf <emmanuelle.delfour@gmail.com>
Change-Id: I19b1654ad5ac6f4ea3a8c1ef468a2e69016b69cc
Gilles Thouenon [Fri, 20 Mar 2020 15:03:44 +0000 (16:03 +0100)]
Bump project to 2.0.0 and fix feature deployment
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I4c2a8b00dcc0ea0451201998fb54da4b464aaba1
guillaume.lambert [Wed, 18 Mar 2020 12:39:16 +0000 (13:39 +0100)]
make Honeynode and tox scripts BSD compatible
- use a sed syntax compatible with both BSD and GNU versions
- replace /bin/bash by /bin/sh (regular bourne shell)
make necessary adaptations for compatibility
- upgrade python psutils requirements to 5.6.7
most BSD does not support earlier version with python 3.7
Co-authored-by: Shweta Vachhani <sv111y@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6d390cede8abbbd44f92554e7b0f164ae5c0b173
Christophe Betoule [Wed, 4 Mar 2020 10:13:35 +0000 (11:13 +0100)]
Fix TAPI artifact deployement issue
Fix regression with regard to the installation and deployment of tapi
bundle/feature brought by change 88138
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I842c1fa839f13a61f662c8ff5a2f87be8567b3d2
(cherry picked from commit
8a1a107601351ab34661b52ae5b6d79f40a965be)
Guillaume Lambert [Thu, 5 Mar 2020 15:48:09 +0000 (15:48 +0000)]
Merge "Migrate rtd docs to python3"
Anil Belur [Sun, 1 Mar 2020 03:44:19 +0000 (13:44 +1000)]
Migrate rtd docs to python3
RTD builds have been failing on python2 since the required version
sphinx is not found in lftools-conf. Migrate to python3 resolves the
issue.
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I48ecbff0a5498f12c0511d6fce2bbd0ed58d1c3f
guillaume.lambert [Fri, 28 Feb 2020 11:28:55 +0000 (12:28 +0100)]
Rationalize features
- clean features pom.xml configurations
- remove models and api useless features
- separate TAPI support in a specific feature
and migrate tapi blueprint folder
- declare TAPI and inventory in karaf pom.xml
- update user guide
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I87ccca5e295c14e1a3ed2d06bebe312a463a5d9c
atriki [Thu, 27 Feb 2020 16:52:04 +0000 (17:52 +0100)]
Update documentation for Magnesium
- introduction of the OTN layer
- presentation of the new services OTU4, ODU4, 1GE/ODU0 and 10GE/ODU2e
- new rpc for otn-service-path
- description of the otn-topology
- description of the interconnection with the GNPy tool to check path
feasilibty and perform impairment-aware path computation
Change-Id: I5869873f7fc426bee04c07b57d37cfcc5da727f2
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Fri, 28 Feb 2020 10:29:21 +0000 (11:29 +0100)]
Fix GNPy functional tests issue due to Mg bump
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Ahmed Triki <ahmed.triki.tn@gmail.com>
Change-Id: I418faab4b76899313c9d1ca86db4240704aaabd5
guillaume.lambert [Thu, 27 Feb 2020 22:51:35 +0000 (23:51 +0100)]
Bump project version to 1.0.0-SNAPSHOT
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iab541b41e97fa488cd63ffc4eebf828299931aad
Gilles Thouenon [Fri, 14 Feb 2020 17:18:25 +0000 (18:18 +0100)]
Fix issues related to Magnesium bump
- use of some Uint32 (instead of Long)
- use of ImmutableList
JIRA: TRNSPRTPCE-198
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Emmanuelle Delfour <emmanuelle.delfour@gmail.com>
Change-Id: Iaba3dda0941e957f549da0e9ca7ddbeb485c7dfe
guillaume.lambert [Fri, 14 Feb 2020 10:12:56 +0000 (11:12 +0100)]
Ignore Junit failing after Magnesium Bump
JIRA: TRNSPRTPCE-198
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1030af29943c26ecb326b33c66d129cf1a413306
guillaume.lambert [Thu, 27 Feb 2020 17:00:11 +0000 (18:00 +0100)]
skip checkstyle and spotbugs in functional tests
odlparent checkstyle and spotbugs slow down a lot the build process.
They must be skipped in releng profile with maven -D option in tox.ini.
JIRA: TRNSPRTPCE-197
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If619bcba7658fc11115f7dd013228c22237c6bce
guillaume.lambert [Tue, 28 Jan 2020 14:13:58 +0000 (15:13 +0100)]
Bump to Magnesium dependencies
https://docs.opendaylight.org/projects/integration-distribution/en/latest/platform-versions.html
- upgrade pom to use ODL Magnesium target dev dependecies
https://wiki.opendaylight.org/view/Magnesium_platform_upgrade
- force jsr305 version
- disable SpotBugs enforcement in artifacts when needed
- UintXX yangtools migration
https://git.opendaylight.org/gerrit/c/mdsal/+/83960
- migrate class BindingStreamEventWriter
from org.opendaylight.yangtools.yang.binding package
to org.opendaylight.mdsal.binding.dom.codec.api
- unforce maven-bundle-plugin version in api/pom.xml
and ordmodels/device/pom.xml build sections
- unfoce iana-afn-safi version in ordmodels/device/pom.xml dependencies
TODO:
for next changes to come in the release:
- migrate Junit to yangtools UintXX
- propose fixes to reactivate SpotBugs enforcement
and get rid of "deprecated marked for removal"
JIRA: TRNSPRTPCE-198
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I20dfe87985a1273e3f0864e6a4d26880fc80d197
guillaume.lambert [Thu, 27 Feb 2020 14:08:15 +0000 (15:08 +0100)]
clean OTN renderer code
JIRA: TRNSPRTPCE-174 TRNSPRTPCE-142
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2babfd00dd554fc23aa8287146d87a7cc445db1d
Gilles Thouenon [Fri, 21 Feb 2020 16:21:20 +0000 (17:21 +0100)]
Functional test for OTN Renderer
New functional test suite for otn renderer. Tests OCH/OTU4/ho-ODU4
creation/deletion, and 10GE/lo-ODU2E creation/deletion.
JIRA: TRNSPRTPCE-143
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I5680b858ef56ed72da172d8852df3e6db0242111
Gilles Thouenon [Wed, 19 Feb 2020 14:31:01 +0000 (15:31 +0100)]
Fix issues in otn renderer
- add timer in OpenRoadmInterface221 to allow update portmapping with
odu supported interface
- manage lo-odu interfaces deletion (odu-connection and associated lo-interfaces)
- manage ho-odu/otu/och interfaces deletion
JIRA: TRNSPRTPCE-174 TRNSPRTPCE-142
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I899f9ffb2fe0a98b1d8a4184444fd4d3dfc4f4d5
shweta [Fri, 31 Jan 2020 20:04:21 +0000 (15:04 -0500)]
OTN Renderer Consolidation
- ODU4 and OTU4 interface creation for OTN service
- Odu2e and Odu0 interfae creation
- odu-connections
- ODU service delete
JIRA: TRNSPRTPCE-174 TRNSPRTPCE-142
Signed-off-by: shweta <sv111y@att.com>
Change-Id: I1726e4b50c9b6dcceb0ba1d8e804fa3bc8b39dd6
shweta [Tue, 10 Dec 2019 15:31:04 +0000 (16:31 +0100)]
init Renderer code for OTN Services
JIRA: TRNSPRTPCE-174
Signed-off-by: shweta <sv111y@att.com>
Change-Id: I1b95a4402038ce450822e3ba84f85f4b677927b6
guillaume.lambert [Wed, 26 Feb 2020 15:58:47 +0000 (16:58 +0100)]
improve functional tests
- make scripts with "sed" compatible with BSD and macOS
- remove illegal reflective access warnings introduced by JDK11
- create a file tests/reflectwarn.sh with the right JDK_JAVA_OPTIONS
variable content.
sourcing this file at build or runtime removes the warnings.
But instead, it generates a long note in stderr that still pollutes
nosetests results.
- in functional tests, move sims and controller stderr to a file to
prevent that note from polluting nosetests results.
https://dev.to/erichelgeson/removing-illegal-reflective-access-warnings-in-grails-4-393o
JIRA: TRNSPRTPCE-192 TRNSPRTPCE-197
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I04156ab104d7420d1eb2d180579593c67293175b
atriki [Mon, 17 Feb 2020 09:36:41 +0000 (10:36 +0100)]
Adapt code to support the new version of GNPy
- change the gnpy version from 1.2 to 2.2 in tox.ini
- modify the yang model to add a new field "bidirectional"
- delete unused code lines
- update the gnpy tests to support the new version
Change-Id: If318cc4515372bdad86ba46d3c4929bc0a15da43
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
Emmanuelle Delfour [Thu, 20 Feb 2020 17:55:50 +0000 (18:55 +0100)]
HoneyNode OTN support
- add odu connection deletion for OTN
Signed-off-by: Emmanuelle Delfour <emmanuelle.delfour@gmail.com>
Change-Id: I8b28c146360b070812d627fed026a64ed2dc2250
Emmanuelle Delfour [Wed, 19 Feb 2020 16:20:19 +0000 (17:20 +0100)]
HoneyNode Java 11 support for 121 devices
- honeycomb 1.19.04 upgrade
- rename 2.1 folder into 1.2.1 to reflect the openroadm device version
rather than the openroadm common version
- update resconf honeynode config to allow remote access
- samples config files update
- delete old testtool 1.2.1 sample configs
- added support for openconfig models
- remove JDK8 gate support from tox and associated scripts
NB: script installJDKCentos.sh contains a workaround to have the right
JDK.
JIRA: TRNSPRTPCE-192
Signed-off-by: Emmanuelle Delfour <emmanuelle.delfour@gmail.com>
Change-Id: Ia30ceb05c927937d9b4fc81d42d91b7558cd1dfd
Emmanuelle Delfour [Tue, 18 Feb 2020 14:37:25 +0000 (15:37 +0100)]
HoneyNode Java 11 support for 221 devices
- honeycomb 1.19.04 upgrade
- update resconf honeynode config to allow remote access
- samples config files update
- added support for openconfig models
- update tox.ini to build 2.2.1 sims with JDK11 in tox releng profile
JIRA: TRNSPRTPCE-192
Signed-off-by: Emmanuelle Delfour <emmanuelle.delfour@gmail.com>
Change-Id: Ie7ffb629c8209bc0c0fa31f482210094647197ca
guillaume.lambert [Fri, 7 Feb 2020 12:45:25 +0000 (13:45 +0100)]
JDK 11 controller support in tox job
update tox.ini to use JDK8 to build the sims
and JDK11 to build the controller and run the JVMs
inside ODL jenkins releng tox job.
JIRA: TRNSPRTPCE-192 TRNSPRTPCE-197
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibb355d1181fd8de32b5b112b0145b87f38e2c38b
Guillaume Lambert [Thu, 20 Feb 2020 10:11:32 +0000 (11:11 +0100)]
fix some files format
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: Id67138c19fde78ce76638bbdabbc98a6c13107ca
guillaume.lambert [Thu, 13 Feb 2020 16:00:09 +0000 (17:00 +0100)]
Fix some SpotBugs issues
JIRA: TRNSPRTPCE-198
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I14e7ef94a94036af7e5fb2725f9116c52dc23476
guillaume.lambert [Sat, 15 Feb 2020 12:40:10 +0000 (13:40 +0100)]
fix docs wiki URL link
TransportPCE wiki URL has been redirect to confluence
but it is not migrated yet resulting in an error here.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icecd04e30cf80fc0c5970f8414e321076f6c9cab
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>