Gilles Thouenon [Tue, 24 Nov 2020 11:59:55 +0000 (12:59 +0100)]
bug fixes in Portmapping 7.1.0
- remove some useless namespaces inside java code
- in createMcCapDegreeObject and createMcCapSrgObject methods
* add a null testing to avoid NPE
* fix default treatment when McCapabilityProfileName is null or empty
- remove treatments on supported-interface-capability
since this attribute is no more present in OpenROADM 7.1.0 ports.
JIRA: TRNSPRTPCE-337
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifdd3d07b88220f5f505be37286e21ca00fb09457
guillaume.lambert [Thu, 12 Nov 2020 10:20:03 +0000 (11:20 +0100)]
Align and improve Portmapping versions Step 1
- add FIXME comments to warn about code duplications at the beginning
of the classes
- minor improvements and alignment over the 3 classes
- remove a useless argument from createNodeInfo versions 2.2.1 and 7.1.0
- point with a TODO comment in the version 1.2.1 createNodeInfo method
the difference of protection there with the 2 other versions
JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I72ff9f05ca51caecb8ec41b6d2f666c6bf50ccbd
guillaume.lambert [Fri, 6 Nov 2020 20:36:08 +0000 (21:36 +0100)]
create a FnvUtils class in common mapping
This way, all the various PortMapping versions now call the same FNV-1
64 bit function. The related common code is extracted from PortMapping
classes and mutualized in FnvUtils.
JIRA: TRNSPRTPCE-352
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1562ed2b919cb784f4c1b833af946568f0ac75e1
Balagangadhar Bathula [Sun, 1 Nov 2020 03:51:14 +0000 (23:51 -0400)]
Port-mapping for 7.1.0 models
adds support for XPDR and ROADM 7.1.0
- copied /pasted the portmapping221 classes to create 710 versions
- make needed adaptations
- declare the 710 bean in blueprint
JIRA: TRNSPRTPCE-337
Change-Id: I6a99b0c232d2ed037a5376d5b86f211d8f0e1020
Balagangadhar Bathula [Fri, 30 Oct 2020 23:17:43 +0000 (19:17 -0400)]
Port-mapping changes to support 7.1.0 models
- upgrade portmapping API YANG files to use 7.1.0 models
- add in API pom.xml a dependency to ordm devices
the attributes 'node-types' and 'xpdr-node-types' have moved to there.
- update java code to use the new portmapping model revision
JIRA: TRNSPRTPCE-256
Change-Id: I5ed81415cc80800b1fadf40ab4ec5ea204e12f49
Balagangadhar Bathula [Thu, 10 Sep 2020 03:05:30 +0000 (23:05 -0400)]
Add OpenROADM 7.1.0 device and common models
- add OpenROADM device and common models version 7.1.0
(previous models 1.2.1 and 2.2.1 are kept)
- keep only essential OpenConfig models used by OpenROADM
- add a NOTICE and an openconfig.LICENSE files in the jar ressources
OpenConfig YANG models are published under the Apache License version 2
a.k.a. ALv2 but they do not precise it in their description.
Though Alv2 allows redistribution under other licenses, it includes a
redistribution clause (4) that instructs to give any other recipients
of the work or the derivative works a copy of the original license.
JIRA: TRNSPRTPCE-225
Change-Id: Idebe4e20f0cb0554dd572c4c667d692c8a6dfcb5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Tue, 10 Nov 2020 13:22:32 +0000 (14:22 +0100)]
Update developer-guide with TAPI section
Update documentation with updated information with regards to TAPI
feature. Explain TAPI abstraction done by TransportPCE.
JIRA: TRNSPRTPCE-267
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I44be5a0e37116ae7c009404a27667cb9ff848e65
manuedelf [Wed, 4 Nov 2020 08:10:24 +0000 (09:10 +0100)]
Remove unused test resource files
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I41aa27121a634c03951c072d6fd3d5a034b623b3
Gilles Thouenon [Tue, 27 Oct 2020 15:01:48 +0000 (16:01 +0100)]
Rewrite TAPI topology functional tests
- reactivate tapi functional tests in tox
- rewrite all the functional test suite in order to complement UTs
JIRA: TRNSPRTPCE-344
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I70008b844f8b15f98ff60968c7ba836ced5b1c00
Gilles Thouenon [Fri, 23 Oct 2020 10:24:33 +0000 (12:24 +0200)]
TAPI topology consolidation - step3
- transform the TAPI multi-layer topology abstraction to expose the
single 100G Transponder layer representing the connectivity between
100GE client ports of 100G Transponders connected to the ROADM
infrastructure. That gives a higher level of abstraction where the whole
otn-topology is abstracted into a single node with only its
corresponding onep.
- add UT to this specific topology abstraction
JIRA: TRNSPRTPCE-344
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I048ff512a74cc5246eafda2cfb8444280b4c29f1
Gilles Thouenon [Fri, 23 Oct 2020 07:56:30 +0000 (09:56 +0200)]
TAPI topology consolidation - step2
- integrate into T0 mulilayer TAPI topology the 100GE Transponders when
their network ports are connected to the ROADM infra through
xponder-input/output links
- manage the client to network port association for the 100GE
transponder case
- adapt ConvertORTopoToTapiTopo and TapiTopologyImpl classes to add new
UT for the 100G transponder use case
- rationalise samples of xml files to adapt portmapping and topologies
to new test cases with 100GE transponder
- separate in a dedicated test file UT testing TAPI exceptions
JIRA: TRNSPRTPCE-344
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I665f2e6290c5a6be1628179a54fb35218c85739b
Gilles Thouenon [Tue, 20 Oct 2020 16:07:49 +0000 (18:07 +0200)]
TAPI topology consolidation
Modify TAPI topology implementation to give an abstraction of
otn-topology for otn nodes whose network ports are connected to ROADM
through xponder-input/output links. Moreover, abstracts also the ROADM
infrastructure through a Photonic TAPI node. As for xponder-input/output
links, they are represented in by OMS links in the T0 multilayer TAPI
topology.
- add new method in ConvertORTopoToTapiTopo to create the ROADM
infrastructure abstraction
- add new method in ConvertORTopoToTapiTopo to create OMS links
- create and manage a TapiTopologyException
- refacto TapiTopologyImpl to improve datastore readings
- refacto and improve UT for TapiTopologyImpl and
ConvertORTopoToTapiTopo classes
- new samples of xml files to adapt portmapping and topologies to new
TAPI topology code and test cases
- disable TAPI functional tests in tox
JIRA: TRNSPRTPCE-341
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I38904051cc3e183eda2586de7a104e46d56e39c8
Gilles Thouenon [Sun, 8 Nov 2020 09:55:18 +0000 (10:55 +0100)]
Fix a method name typo in tapi module
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic573c9267457f31fef40b5e2f9659138627ab876
Gilles Thouenon [Tue, 20 Oct 2020 16:01:54 +0000 (18:01 +0200)]
Make AbstractTest as static class
Adapt AbstractTest to allow use of @BeforeClass for TAPI UT improvements
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I5f25e7ccf2d781f18822a6a7884030ed97abe9f3
Gilles Thouenon [Sat, 24 Oct 2020 07:27:49 +0000 (09:27 +0200)]
Strengthens independence between UTs in OLM
Use the adequate method of AbstracTest (getNewDataBroker())to be sure
that the same datastore context will not be shared between two UT.
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie0e8a7aac6dd87f310c9e800eec83a77b24dfcf9
manuedelf [Tue, 3 Nov 2020 09:02:44 +0000 (10:02 +0100)]
Precise Charsets in FileReader() methods
This is strongly advised and will be enforced after Silicon migration
and its switch to maven-modernizer-plugin.
JIRA: TRNSPRTPCE-345
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8f432106cee8a117979bd40e2b889d563ae44fb3
manuedelf [Mon, 2 Nov 2020 13:35:14 +0000 (14:35 +0100)]
remove odl-mdsal-broker useless dep from features
Change-Id: I23fe0e3a66a1fd86034cc7268465af43296da4a1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Fri, 30 Oct 2020 12:26:59 +0000 (13:26 +0100)]
force lighty use in tox
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I849923ce4d50c02b5fd377acb29abbe5ed4ec75c
guillaume.lambert [Fri, 30 Oct 2020 14:00:49 +0000 (15:00 +0100)]
add a healthcheck to lighty startup in func tests
JIRA: TRNSPRTPCE-294
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3267de8fde9eb9e1a34f51eb6cb3f7584873cbfa
guillaume.lambert [Wed, 30 Sep 2020 14:52:25 +0000 (16:52 +0200)]
fix Lighty.io build
- migrate to new lighty-core API
- migrate to new TPCE API
- fix java max heap sizes in start scripts
JIRA: TRNSPRTPCE-294
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id8906afd05ba7bee6468992d2d255b5db4b621e3
Guillaume Lambert [Tue, 27 Oct 2020 09:48:58 +0000 (09:48 +0000)]
Merge "bump deps to latest Al SR1 dev platform versions"
guillaume.lambert [Mon, 26 Oct 2020 21:53:29 +0000 (22:53 +0100)]
bump deps to latest Al SR1 dev platform versions
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I145c1f061f38d88440705eaf527cd5239c50186c
guillaume.lambert [Thu, 15 Oct 2020 14:19:56 +0000 (16:19 +0200)]
Service Handler optimizations and technical debt
- optimize some pieces of code
- add some protection on RpcStatus return Code treatments
especially when a Pending or an unknown status is returned
JIRA: TRNSPRTPCE-342
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifd28578767a7c2c155e0f90ed04c736e5f104b3f
guillaume.lambert [Wed, 21 Oct 2020 09:17:22 +0000 (11:17 +0200)]
remove some findbugs jsr305 useless dependencies
spotbugs-annotations dependency is now in odlparent pom and provides
already some of the needed material brought by this dependency before.
TODO: migrate remaining jsr305 dependencies to a more recent solution
https://groups.google.com/g/jenkinsci-dev/c/uE1wwtVi1W0
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6911be93f672b25ac07c85d7dfb25dd6695c8290
guillaume.lambert [Fri, 16 Oct 2020 14:47:15 +0000 (16:47 +0200)]
use BOM in odl-transportpce feature pom
instead of specifying the right version each time
JIRA: TRNSPRTPCE-346
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I23c08594c6483d090d75f66f0c639528f22802ca
guillaume.lambert [Tue, 13 Oct 2020 13:58:55 +0000 (15:58 +0200)]
fix/rename transportpce-network-topology YANG file
The filename was inconsistent with its namespace and prefix i.e.
transportpce-topology and tpce-topology.
JIRA: TRNSPRTPCE-340
Change-Id: Ica44bef1026842de8258dbb77e69d37f3bd89716
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Balagangadhar Bathula [Wed, 7 Oct 2020 16:00:48 +0000 (12:00 -0400)]
Clean up API YANG models with the help of pyang
This addresses the following pyang generated warnings
- Remove any unused imports
- Add revision dates to the imports
- Order the revisions
- Fix a warning in org-openroadm-resource (MSA related)
JIRA: TRNSPRTPCE-340
Change-Id: I37dae25c3a54d5245a84b209b0f1f1981799fe5a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Balagangadhar Bathula [Wed, 7 Oct 2020 15:31:24 +0000 (11:31 -0400)]
rename API transportpce-renderer-device YANG file
and modify java code / imports accordingly.
The filename was inconsistent with its namespace and prefix i.e.
transportpce-device-renderer.
JIRA: TRNSPRTPCE-340
Change-Id: I088813daa46472745400cd4cdd764061c1e20444
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Balagangadhar Bathula [Wed, 7 Oct 2020 14:37:15 +0000 (10:37 -0400)]
fix a bug in ServiceHandler ModelMappingUtil
OTU, ODU and CLLI are wrongly assigned twice.
JIRA: TRNSPRTPCE-339
Change-Id: I3277d7d97bf43be2ddfd501d64d827107e84ce28
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
manuedelf [Fri, 9 Oct 2020 18:42:54 +0000 (20:42 +0200)]
Technical debt - fix SH deprecated warnings
JIRA: TRNSPRTPCE-334
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ia7ed580e7c15050cbffd75be433aef5806097e2c
(cherry picked from commit
ee1ddcf873e73d9952aa5002e242b003c53795bf)
manuedelf [Fri, 9 Oct 2020 13:30:06 +0000 (15:30 +0200)]
Technical debt - Service handler Sonar issues
JIRA: TRNSPRTPCE-214
Change-Id: Ibdae3184f6f261e371db8d12e4719b105ca61705
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
(cherry picked from commit
a07392226a2e30930323959a5f6925812f5192ae)
manuedelf [Mon, 12 Oct 2020 09:43:30 +0000 (11:43 +0200)]
Bump to Aluminium SR1 dev version
JIRA: TRNSPRTPCE-336
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ie16a4d93061a0e92cc24cb39d150c569b09345d6
manuedelf [Mon, 12 Oct 2020 12:36:26 +0000 (14:36 +0200)]
Fix tpce internal Yang syntax
- garbage/superflous "}" are no more tolerated by yangtools
JIRA: TRNSPRTPCE-336
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I4d9ec5ffc20a9daca4487a3e783e0183b517fbe3
(cherry picked from commit
bded2dfda7111cb9d1f263b06794319103dc5d90)
Guillaume Lambert [Mon, 12 Oct 2020 09:32:01 +0000 (09:32 +0000)]
Merge "Technical debt - Fix PCE sonar issues"
Guillaume Lambert [Mon, 12 Oct 2020 09:31:24 +0000 (09:31 +0000)]
Merge "Technical debt - fix Renderer sonar issues"
manuedelf [Fri, 9 Oct 2020 09:47:46 +0000 (11:47 +0200)]
Technical debt - Fix PCE sonar issues
JIRA: TRNSPRTPCE-274
Change-Id: If50936c2cf75be450212f9f568125cfb6033a0d8
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
(cherry picked from commit
bc9a08be9d7cdeb30ecffd3c82ddd656a3a23043)
manuedelf [Thu, 8 Oct 2020 11:46:44 +0000 (13:46 +0200)]
Technical debt - fix Renderer sonar issues
JIRA: TRNSPRTPCE-213
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iadbd280f814b3ea7e9b8c55740bdb4a8698cdfc4
(cherry picked from commit
77743225e0c72a218d6606a2767c979bee61c5ef)
guillaume.lambert [Thu, 17 Sep 2020 08:07:21 +0000 (10:07 +0200)]
rationalize inventory code
JIRA: TRNSPRTPCE-207
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3e3f0e9535b98652ac3643151f68dd02ee0e21a4
Gilles Thouenon [Wed, 7 Oct 2020 15:48:01 +0000 (17:48 +0200)]
Add OTN links support in TAPI topology
- Add OTN OTU4 and ODU4 links in TAPI topology. Replace 2
unidirectional OTU4 links in OpenROADM otn-topology by a single
bidirectional Photonics link in TAPI. In the same way, replace 2
unidirectional ODU4 links in OpenROADM otn-topology by a single
bidirectional ODU link in TAPI topology
- add new Unitary tests for TAPI otn links
- add a new sample OpenROADM otn-topology XML file
containing more nodes with OTN links as input for UTs
- adapt UUID creation to take into account new OTN topology context
- wait that the XML input file has been written in datastore before
getting topology from it in UT
JIRA: TRNSPRTPCE-185
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I5c762f30d3bd290b98d04d7f960fb1077be3a111
(cherry picked from commit
a01f4032cd7dc71e3f047db5b3e2db77c4733b2c)
Gilles Thouenon [Tue, 6 Oct 2020 08:58:09 +0000 (10:58 +0200)]
Fix bug in TAPI for transitional links
UUID of transitional links were identical for SPDR-SA1 and SPDR-SC1.
To solve it, we can consider the node id to create a per-device unique
UUID.
JIRA: TRNSPRTPCE-333
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I00943607bdc553bfdaef045cb8fad03a8a80efd8
(cherry picked from commit
92025c52874815268743b848ea79e2fbe2a39ab7)
Guillaume Lambert [Fri, 2 Oct 2020 18:16:53 +0000 (18:16 +0000)]
Merge "Reactive remaining Junits tests for Al migration"
Guillaume Lambert [Fri, 2 Oct 2020 18:16:29 +0000 (18:16 +0000)]
Merge "Migrate to Al and reactivate some Junit tests"
guillaume.lambert [Tue, 22 Sep 2020 08:11:12 +0000 (10:11 +0200)]
do not explicit serialVersionUID anymore
A new SpotBug rule has been introduced in odlparent Aluminium and
suggests to explicit the serialVersionUID in serializable classes to
avoid compilers interoperability problems due to a Java implementation
design flaw.
If this is useful in a few situations (rare today), this also means that
theorically developers must maintain this field and increment it across
classes incompatible versions.
Practically, this step is often forgotten, paving the way to more
serious problems.
Since the situation here does not require it, it is healthier to simply
ignore this (soon obsolete?) recommendation.
For more details:
git log pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
https://github.com/rzwitserloot/lombok/wiki/WHY-NOT:-serialVersionUID
https://moi.vonos.net/java/serialization-synthetic/
https://rules.sonarsource.com/java/RSPEC-4926
https://www.vojtechruzicka.com/explicitly-declare-serialversionuid/
https://www.infoworld.com/article/
3275924/oracle-plans-to-dump-risky-java-serialization.html
JIRA: TRNSPRTPCE-292
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4e36134061104d912a75f3a578d43ca0bc17ab1f
Guillaume Lambert [Fri, 25 Sep 2020 17:43:47 +0000 (17:43 +0000)]
Merge "Move common DataStoreContext and co to test-common"
manuedelf [Tue, 15 Sep 2020 14:31:11 +0000 (16:31 +0200)]
Reactive remaining Junits tests for Al migration
JIRA: TRNSPRTPCE-305
Change-Id: I0e684f389b4c9f4e0924d0cfef244992d0da8ca5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
manuedelf [Tue, 15 Sep 2020 14:31:11 +0000 (16:31 +0200)]
Migrate to Al and reactivate some Junit tests
- Use of BindingDOMCodecServices in DataStoreContext
- remove @Ignore decorator and fix unit tests when needed
This commit reintroduces the import of mdsal.binding.dom.codec.impl
.BindingCodecContext in common/src/main/[..]/DataStoreContextImpl.java.
This dependency was preventing karaf from starting up correctly and was
removed previously in commit
243c08d8b7ad90b0cbaec76a33a639d6fa96f5c8
Since DataStoreContext is no more used outside of the test scope,
common/src/main/[..]/DataStoreContext.java and friends have been moved
into test-common before reintroducing this import.
They are now only used in test scope / build time.
This way, the karaf start-up problem is avoided.
JIRA: TRNSPRTPCE-305
Change-Id: I246a9d58879be047c470f8a683993bc81d3a54a3
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
manuedelf [Tue, 15 Sep 2020 14:31:11 +0000 (16:31 +0200)]
Move common DataStoreContext and co to test-common
Before Al migration, DataStoreContext was used only by GNPy at run-time.
As GNPy does not use it anymore, move it to test scope by putting it in
the test-common module.
JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8ea8afbdab56de08c594c9edb55543cb8d1901b7
Guillaume Lambert [Fri, 25 Sep 2020 09:34:38 +0000 (09:34 +0000)]
Merge "Test suite for flex-grid support"
Guillaume Lambert [Fri, 25 Sep 2020 06:25:43 +0000 (06:25 +0000)]
Merge "bump doc config to Silicon"
Guillaume Lambert [Thu, 24 Sep 2020 15:23:49 +0000 (15:23 +0000)]
Merge changes from topic "pylint-issues"
* changes:
use dict instead of many elif in functional tests
convert test_topoPortmapping.py to snake case
remove dead code from topology221 test
fix some pylint issues
fix superflous parenthesis pointed out by pylint
fix functional tests linelength pylint issues
fix few bugs and unused issues in functional tests
fix pylint configuration
run autopep8 on functional tests
Guillaume Lambert [Thu, 24 Sep 2020 14:28:55 +0000 (14:28 +0000)]
Merge "fix a bug in PceTestUtils Junit"
guillaume.lambert [Thu, 24 Sep 2020 13:55:01 +0000 (15:55 +0200)]
bump doc config to Silicon
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I890bf35f9103b078832ec4966b05047a151a71f8
guillaume.lambert [Thu, 24 Sep 2020 09:00:44 +0000 (11:00 +0200)]
improve TAPI feature installation Al documentation
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8fea67fe31a8a94775f7800b2829c4f17c795a1d
Guillaume Lambert [Wed, 23 Sep 2020 06:31:49 +0000 (06:31 +0000)]
Merge changes from topic "aluminium-migration"
* changes:
fix test-common dependency scope in some pom files
Remove dead code from Junit tests
Gilles Thouenon [Tue, 22 Sep 2020 11:25:38 +0000 (13:25 +0200)]
Update Aluminium documentation
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Olivier Renais <olivier.renais@orange.com>
Change-Id: I6efff17677c201168e9fab06f42fc643a6056be3
Gilles Thouenon [Thu, 16 Jul 2020 09:40:24 +0000 (11:40 +0200)]
Update MgSR2 documentation for OTN part
JIRA: TRNSPRTPCE-289
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ie890eecdd9eb3f8c11dfe444986b7e2b12095d60
(cherry picked from commit
7087db699fa0738bb32d1f024c140e638ccaf4a4)
(cherry picked from commit
38553322cca7bc6cf90ff5a5a2196001e781a97e)
manuedelf [Mon, 21 Sep 2020 12:31:11 +0000 (14:31 +0200)]
fix a bug in PceTestUtils Junit
JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I727ea7dac4d68069cadb5d63f25ae704a26a4c1a
manuedelf [Mon, 21 Sep 2020 12:26:12 +0000 (14:26 +0200)]
fix test-common dependency scope in some pom files
JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I792c0e765b8b7f460ee77d5e51297f1d76e575ff
guillaume.lambert [Mon, 21 Sep 2020 08:02:31 +0000 (10:02 +0200)]
Remove dead code from Junit tests
JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8c584686a80bf4daf6eefd09c3250240bba39e1e
guillaume.lambert [Wed, 9 Sep 2020 10:06:26 +0000 (12:06 +0200)]
use dict instead of many elif in functional tests
and add some forgotten tests in topology tests
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic0d0e00931527ecf421914fd3bf2048504758f49
guillaume.lambert [Thu, 10 Sep 2020 09:46:42 +0000 (11:46 +0200)]
convert test_topoPortmapping.py to snake case
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I815871de4609c724cffe5f7ccdbcbfa3cab70de9
guillaume.lambert [Thu, 10 Sep 2020 09:42:53 +0000 (11:42 +0200)]
remove dead code from topology221 test
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3657ce7a6af97b8043577c38cd579df352d32718
guillaume.lambert [Mon, 7 Sep 2020 14:44:51 +0000 (16:44 +0200)]
fix some pylint issues
and use a "#pylint disable=" comment to eliminate false positives
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4a741f9f30f6d8e2e2ea209ad44f936cdaf6150f
guillaume.lambert [Fri, 4 Sep 2020 14:25:42 +0000 (16:25 +0200)]
fix superflous parenthesis pointed out by pylint
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe23741d5a18814575cd05f1590d7c5ce0379c92
guillaume.lambert [Fri, 4 Sep 2020 13:13:33 +0000 (15:13 +0200)]
fix functional tests linelength pylint issues
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4850052ec973fc799e956e1e4c5e817e8def4360
guillaume.lambert [Fri, 4 Sep 2020 09:32:21 +0000 (11:32 +0200)]
fix few bugs and unused issues in functional tests
pointed out by pylint
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I37d95d2df919fd020fecf2750452442fb482ffb7
guillaume.lambert [Fri, 4 Sep 2020 08:52:02 +0000 (10:52 +0200)]
fix pylint configuration
- modify the method regex used:
Tests methods name are commonly above the default limit of 32 char.
They also use capital letters here to abide by the OpenROADM and WDM
naming conventions.
- modify the variable regex used:
It was supporting by default only the snake case and reported
camel case variables as errors.
Variable names also use capital letters here to abide by the OpenROADM
and WDM naming conventions.
- disable the no-member check (inline):
it reports many false positives since pylint is unable to retrieve
the HTTP return codes given in the request package dictionary
- disable the too-many-public-methods check (inline):
it reports many false positives since unittests requires many public
methods
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I21686442628591fd2c4af5182dc9f438e5701cb2
guillaume.lambert [Fri, 4 Sep 2020 08:41:16 +0000 (10:41 +0200)]
run autopep8 on functional tests
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6a4bc50291e1debde1ecf3bbdf57368ba235ace6
Balagangadhar Bathula [Mon, 20 Jul 2020 05:04:07 +0000 (01:04 -0400)]
Test suite for flex-grid support
- Add new config with mc-capabilities
- New functional tests to check the flex-grid interfaces
- Functional tests for updaed portmapping
- Functional test for device-renderer
JIRA: TRNSPRTPCE-253 TRNSPRTPCE-307
Change-Id: Ic4999c1b117d762ba2fe0f6b959a513f65235580
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Fri, 18 Sep 2020 06:44:57 +0000 (08:44 +0200)]
Bump project version to 3.0.0-SNAPSHOT/Silicon SR0
JIRA: TRNSPRTPCE-328
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8e8560e410544d993264b5e230090925e2fe4c18
Christophe Betoule [Thu, 3 Sep 2020 16:27:08 +0000 (18:27 +0200)]
GNPy migration to Aluminium
- use BindingDOMCodecServices instead of direct implementation
- update the GNPy YANG model in the API
by removing the key index from route-object-include-exclude
- add log debug for request and response to and from GNPy api
- Junit tests will be managed in another change
JIRA: TRNSPRTPCE-314
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic9f7d04ab04f963e9c3374637b93b7920fe8a3d8
Gilles Thouenon [Mon, 31 Aug 2020 13:59:20 +0000 (15:59 +0200)]
Make TransportPCE functional tests running
- code request "not found" have been replaced by "conflict"
- adapt some tests to new structure returned by the REST API.
- increase karaf JAVA memory size in tapi functional test
JIRA: TRNSPRTPCE-310 TRNSPRTPCE-292
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I89b441d7fe17823397551b4af472e9d88e9683b2
guillaume.lambert [Tue, 18 Aug 2020 14:16:13 +0000 (16:16 +0200)]
Ignore Junit failures after dom.codec.impl removal
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-305
Change-Id: Ifac3667cfc34d0959047c901e04815ec7254d136
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Wed, 19 Aug 2020 15:23:07 +0000 (17:23 +0200)]
get rid of mdsal.binding.dom.codec.impl
to fix karaf startup issue.
Starting from Aluminium, this package can no more be consumed directly
outside of MDSAL by OSGi bundles- cf mdsal change 89040
https://git.opendaylight.org/gerrit/c/mdsal/+/89040
As a result, the code still builds but hangs at runtime.
Also since schemacontext is being retired, the best option for getting
rid of it is to migrate to EffectiveModelContext ConstantAdapterContext.
https://docs.opendaylight.org/en/latest/release-notes/upgrade-process.html#schemacontext-is-being-retired
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-295
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id01b032411100c82dbf41b361a9c85d06aeb98d9
guillaume.lambert [Tue, 18 Aug 2020 14:16:13 +0000 (16:16 +0200)]
Ignore Junit tests in failure after Al migration
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4b13e053a87865688b8884a7156df0a30aa08e23
guillaume.lambert [Mon, 17 Aug 2020 12:55:07 +0000 (14:55 +0200)]
Migrate TAPI module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-304
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I23c0277460a265525e18662ba127691dd71fa284
guillaume.lambert [Tue, 18 Aug 2020 07:54:35 +0000 (09:54 +0200)]
Migrate SH module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-303
Change-Id: I55c9df594ab1bec2f2de737c3a35bbec8db4e8b4
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
manuedelf [Tue, 18 Aug 2020 07:12:13 +0000 (09:12 +0200)]
Migrate PCE module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-302
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib533555abc85c2bb6b38eed02e01e6513e7afe47
guillaume.lambert [Tue, 15 Sep 2020 13:53:57 +0000 (15:53 +0200)]
Unplug savagely a GNPy link to the PCE module
MDSAL codecRegistry Serializer implementation can no more be used
directly as it is done in the PCE for GNPy. This operation must be done
now through the BindingDOMCodec OSGi Services instead.
However, this adaptation is easier to proceed after the PCE migration.
Let's unplug this part of the code for the moment.
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-302 TRNSPRTPCE-314
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If841413637b1d6983bdae49d835f6ccb574036d8
manuedelf [Tue, 18 Aug 2020 07:03:07 +0000 (09:03 +0200)]
Migrate OLM module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-301
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1d7a9cbc18399c1e211b07aaafd64057d52bb0f0
manuedelf [Tue, 18 Aug 2020 07:02:45 +0000 (09:02 +0200)]
Migrate inventory module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-300
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If4314c58461a1d6cc6f38475dbdf743cd674495e
manuedelf [Tue, 18 Aug 2020 07:02:13 +0000 (09:02 +0200)]
Migrate renderer module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-299
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7c63b5b2edd53ec5424925449825e36a4edeacd7
manuedelf [Tue, 18 Aug 2020 07:01:39 +0000 (09:01 +0200)]
Migrate networkmodel module to Aluminium
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-298
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2603b7b304f90a1c85e23c21884ce90e49b34318
manuedelf [Tue, 18 Aug 2020 07:00:02 +0000 (09:00 +0200)]
Migrate common module to Aluminium Step 2
mostly to use EffectiveModelContext instead of SchemaContext
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-297 TRNSPRTPCE-306
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I393d935c0d27d45fe068895e327baf7ff6408bcf
manuedelf [Thu, 27 Aug 2020 08:32:55 +0000 (10:32 +0200)]
Migrate common module to Aluminium Step 1
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-297
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9d264136b83d1267cee4e59520b0a682d4258c24
manuedelf [Thu, 27 Aug 2020 08:38:19 +0000 (10:38 +0200)]
Remove common module deprecated methods
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I097d664cb06f9505ed94f04e899b0cae738b5fe3
Gilles Thouenon [Mon, 31 Aug 2020 13:54:19 +0000 (15:54 +0200)]
fix blueprints to let karaf inject mdsal deps
https://docs.opendaylight.org/en/latest/release-notes/upgrade-process.html#use-of-odl-type-in-blueprint-is-discouraged
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I43bf6c7d733656df2c4f0288b30e9ca777911927
guillaume.lambert [Mon, 17 Aug 2020 14:13:52 +0000 (16:13 +0200)]
package iana-afn-safi with ordmodels device
since it has been removed from mdsal
https://git.opendaylight.org/gerrit/c/mdsal/+/89095/
NB: iana-afn-safi and OpenROADM use 2 different licenses
but both are of the BSD family and are compatible with EPL
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-296 TRNSPRTPCE-293
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I0da1728b9e02acd801862316a322f43e37524797
Gilles Thouenon [Thu, 13 Aug 2020 08:21:44 +0000 (10:21 +0200)]
Bump projet dependencies to Aluminium
- odlparent => 7.0.5
- mdsal => 6.0.4
- netconf => 1.9.0-SNAPSHOT
- restconf => 1.12.0-SNAPSHOT
- controller => 2.0.3
- lighty.io => 13.0.0 (not yet available on maven central)
maybe 13.0.0-SNAPSHOT would be more indicated at that stage
but it is not referenced
the other option would be to build lighty-core master as before
https://docs.opendaylight.org/projects/integration-distribution/en/latest/platform-versions.html
https://docs.opendaylight.org/en/latest/release-notes/upgrade-process.html?highlight=upgrade#version-bump
JIRA: TRNSPRTPCE-292 TRNSPRTPCE-296 TRNSPRTPCE-294
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: manuedelf <emmanuelle.delfour@orange.com>
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe488f1822f39ece3c054c4dab9ceac253a2b555
Susmitha Avula [Mon, 15 Jun 2020 20:22:00 +0000 (16:22 -0400)]
Enabled flex-grid support for 2.2.1 Roadms
- Added FlexGridImpl class
- Modified device-renderer for creating MC and NMC
interfaces
JIRA: TRNSPRTPCE-253 TRNSPRTPCE-307
Change-Id: I6d3546d35d7dc80c4b3fb60a0a8916416d28658a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Balagangadhar Bathula [Mon, 20 Jul 2020 03:44:35 +0000 (23:44 -0400)]
Upgrade portmapping YANG to enable flex-grid
- Add list in node container of portmapping to support flex-grid
mc-capabilities for ROADM node.
- modify import statements accordingly.
- modify tests that were failing.
JIRA: TRNSPRTPCE-253 TRNSPRTPCE-307
Change-Id: I4b821b46ca700295f024eef1ceaf39673c07de49
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Mon, 31 Aug 2020 07:59:15 +0000 (09:59 +0200)]
Bump dependencies to Mg SR3 dev versions
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I08f8f327084ad5849d2231f4957d5d56a9b281fc
guillaume.lambert [Tue, 25 Aug 2020 13:09:32 +0000 (15:09 +0200)]
improve OTN renderer functional test
port-types listed in supported-interface-capability are not ordered.
Thus, all possible order must be supported.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iadec827ba5fff1c8b462f5add104d543a40c734f
AhmedEldeeb50 [Mon, 6 Jul 2020 15:59:32 +0000 (17:59 +0200)]
add unit tests for crossconnect package
JIRA: TRNSPRTPCE-276
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: I4b2048c9272322bcc48b950f4db11afeb82494f8
guillaume.lambert [Wed, 12 Aug 2020 22:29:16 +0000 (00:29 +0200)]
add a path computation request method in functests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5eecbb906b79844fc829025f27893d57d2bad19b
guillaume.lambert [Thu, 13 Aug 2020 07:34:12 +0000 (09:34 +0200)]
use service deletion method in OTN E2E functest
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If796ce6c712157c505b201f6c56559cfba77f146
guillaume.lambert [Wed, 12 Aug 2020 10:28:14 +0000 (12:28 +0200)]
rationalize service deletion in E2E functests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I55c75329eb599ad8f525641d5eb694f6e42843d8
guillaume.lambert [Wed, 12 Aug 2020 09:08:56 +0000 (11:08 +0200)]
fix new methods forgotten calls in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I560f2a36610138b936791ba4c7cfd67d27d3ef6e
guillaume.lambert [Tue, 11 Aug 2020 08:27:31 +0000 (10:27 +0200)]
rationalize functional tests calls to service-path
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib3833a5579361d5f8345d534d26ee9793f7b94d7
guillaume.lambert [Fri, 24 Jul 2020 12:17:41 +0000 (14:17 +0200)]
rationalize service creation vars in E2E functests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id904afaee15d1375dd806555fdc431e2092f6ae6