guillaume.lambert [Mon, 12 Apr 2021 07:37:00 +0000 (09:37 +0200)]
Increase sims startup timeout in functional tests
Many failures in the gate seem to appear because the sims
do not start quickly enough.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9c9e77180cb7687052f18223ec69647b3fa52327
Gilles Thouenon [Mon, 12 Apr 2021 07:07:38 +0000 (09:07 +0200)]
Refactor (un)registration of device listeners
- simplify the way to register/unregister node listeners, taking into
acount the different device versions
- adapt UT of NetConfTopologyListener class
JIRA: TRNSPRTPCE-430
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Id8d1d04ac2f43035fb3de6e71d9a77a77a14faec
Gilles Thouenon [Sat, 6 Mar 2021 14:32:34 +0000 (15:32 +0100)]
Handle notification reception on port state change
- implement reception of a changeNotification on DeviceListener221 when
a device port state change
- rename DeviceListener to DeviceListener121 and align its
implementation on the DeviceListener221 one
- add a new DeviceListener710 with the same implementation of other
device listeners
- refactor all the NetconfTopologyListener class to remove technical
debts after extension to DeviceListener221 and DeviceListener710
- refactor NetconfTopologyListenerTest UT to be aligned with the new
implementation
JIRA: TRNSPRTPCE-422
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7af3073071e47383dbf8629d261c7d07a8113e91
Gilles Thouenon [Sat, 6 Mar 2021 14:34:27 +0000 (15:34 +0100)]
Update portmapping on port state notification
- review javadoc for PortMapping interface
- implements new getMapping method to retreive mapping from circuit-pack
name and port name
- add new updateMappingObject method
- review updateMapping() method
- review createMappingObject() method
JIRA: TRNSPRTPCE-423
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I72fe43f17b395ba67f8ac24a41e65b294f06d171
guillaume.lambert [Fri, 9 Apr 2021 12:22:34 +0000 (14:22 +0200)]
Increase controller startup timeout in func tests
Many failures in the gate seem to appear because the controller
does not start quickly enough.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I24825131c48c017f4bcda79255bcdd27b17ab1cf
guillaume.lambert [Fri, 9 Apr 2021 12:16:36 +0000 (14:16 +0200)]
Improve docs/conf.py
- increase docs-linkcheck timeout
- ignore dmaap sample URL
JIRA: TRNSPRTPCE-406
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5611872ef34e4eca30705b6d3cc6df73138ca0e2
manuedelf [Tue, 6 Apr 2021 10:34:16 +0000 (12:34 +0200)]
Add Dmaap client feature documentation
JIRA: TRNSPRTPCE-406
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ic9aa1cd794a562dca0f8a534e10b87c5a8b6190f
Christophe Betoule [Wed, 31 Mar 2021 13:06:58 +0000 (15:06 +0200)]
fix issue in Lighty for PortMapping
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ia9dd5a87218fb57c6befd7356ac4a8f053a3d1f7
(cherry picked from commit
3ce821fa313d35ca73caf877be327ade10493bf7)
guillaume.lambert [Tue, 30 Mar 2021 14:11:15 +0000 (16:11 +0200)]
Remove a useless dependency in PCE
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I25e55cdcf053f020831108d50a9a2c6497b08b7d
Guillaume Lambert [Tue, 30 Mar 2021 13:36:07 +0000 (13:36 +0000)]
Merge "Fix a few compilation warnings"
Guillaume Lambert [Tue, 30 Mar 2021 13:35:20 +0000 (13:35 +0000)]
Merge "Fix OpenRoadmInterface710 portmapping revision"
guillaume.lambert [Tue, 30 Mar 2021 10:26:16 +0000 (12:26 +0200)]
Fix a few compilation warnings
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1eeaa45ddce239db0e31a703ef0ed27f8798575e
guillaume.lambert [Tue, 30 Mar 2021 09:46:35 +0000 (11:46 +0200)]
Fix OpenRoadmInterface710 portmapping revision
A few previous commits were not rebased before merging.
And the automerge Gerrit process dealt incorrectly with this import.
JIRA: TRNSPRTPCE-405
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib67f351ad8347d3a149790e2d46ed7e3058c339d
guillaume.lambert [Tue, 30 Mar 2021 09:25:44 +0000 (11:25 +0200)]
Bump project version to 4.0.0-SNAPSHOT
JIRA: TRNSPRTPCE-411
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I61582fdd8ee6a153d03c614e6f90a6925d77d2b8
Guillaume Lambert [Mon, 29 Mar 2021 08:01:21 +0000 (08:01 +0000)]
Merge "Functional test for pce 400G"
Guillaume Lambert [Mon, 29 Mar 2021 07:58:48 +0000 (07:58 +0000)]
Merge "Fix bug in portmapping"
Guillaume Lambert [Thu, 25 Mar 2021 12:46:40 +0000 (12:46 +0000)]
Merge "Device Renderer to support transponder for B100G"
Christophe Betoule [Thu, 11 Mar 2021 15:59:42 +0000 (16:59 +0100)]
Fix bug in portmapping
Sort the way circuit-packs are handling when creating mapping object in
order to have logical affectation of logical-connection-point and their
associated ports.
JIRA: TRNSPRTPCE-418
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I92770308a1828229940e8d25ce6f1fc0f1f35917
Guillaume Lambert [Wed, 24 Mar 2021 13:49:19 +0000 (13:49 +0000)]
Merge "Improve otnrenderer functional test"
Balagangadhar Bathula [Wed, 24 Feb 2021 15:07:47 +0000 (10:07 -0500)]
Device Renderer to support transponder for B100G
- Addition of OpenRoadm interfaces for 7.1.0 model
- Modification to OpenRoadm interface factory
- Modify the JUnit tests, Lighty and OSGi resources to support this change
JIRA: TRNSPRTPCE-258
Change-Id: I896eb3d3dd958afba7186335207cf385d8ec8034
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Wed, 24 Mar 2021 12:51:03 +0000 (12:51 +0000)]
Merge "Updated OLM module to support 7.1 devices"
guillaume.lambert [Thu, 11 Mar 2021 16:24:46 +0000 (17:24 +0100)]
Improve otnrenderer functional test
JIRA: TRNSPRTPCE-415
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iace4b508f1da2ad61cab6eaf947eba4350d03c84
guillaume.lambert [Fri, 5 Mar 2021 17:29:20 +0000 (18:29 +0100)]
Improve debug tools install
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I287fd6e692a70979599b93ff3b59b06706ee62c4
Christophe Betoule [Thu, 11 Mar 2021 09:26:08 +0000 (10:26 +0100)]
Functional test for pce 400G
Tests the path computation request for a 400GE service between two 400G
transponders
JIRA: TRNSPRTPCE-372
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I1432d92890771786eb01c658462ca1c3876c046c
Guillaume Lambert [Mon, 15 Mar 2021 09:15:15 +0000 (09:15 +0000)]
Merge changes from topic "nbinotification"
* changes:
Dmaap client as a karaf feature
Dmaap client
Add tests for service Notifications
Update ServiceHandler to send service notification
Improve lighty format message
Fix a few typo in lighty main
NBI Notifications as karaf feature
Add new Maven module to manage NBI Notifications
guillaume.lambert [Thu, 11 Mar 2021 16:25:29 +0000 (17:25 +0100)]
Fix maven detection in tox.ini
which is better indicated than command eventually
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3398199c15e3d0449f84be5967acd8e1145cc587
manuedelf [Tue, 2 Feb 2021 22:14:24 +0000 (23:14 +0100)]
Dmaap client as a karaf feature
- add new maven module in features maven projet
- to override default Dmaap server properties, export following env
variable before starting karaf and installing the feature:
DMAAP_BASE_URL, DMAAP_USERNAME and DMAAP_PASSWORD if authentication is
needed
JIRA: TRNSPRTPCE-394
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Iac9fbde72d0add3b2a211a857a6cfb818508b07e
manuedelf [Tue, 2 Feb 2021 22:08:17 +0000 (23:08 +0100)]
Dmaap client
- REST client in order to send TPCE notification
on ONAP Dmaap Message router.
- Add a new maven module dmaap-client.
- Use customized jackson serializer as a temporary workaround
while waiting jackson support in yang tools
https://git.opendaylight.org/gerrit/c/yangtools/+/94852
JIRA: TRNSPRTPCE-394
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: If31ee8befccba0b7e0e34b7cdadb27cc87858fed
Thierry Jiao [Thu, 17 Dec 2020 17:39:49 +0000 (18:39 +0100)]
Add tests for service Notifications
- Add functional test test_nbinotifications.py to check the sending of
service notifications when service-create and service-delete
are invoked
- Update test_utils.py by adding a new function capable of getting the
service notifications
- Add docker-compose.yml necessary for Kafka and ZooKeeper dockers
- Update tox.ini to include the new functional test and run
Kafka/ZooKeeper dockers
JIRA: TRNSPRTPCE-343
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: Ice4d8a2980317ee1dca6533752466305ed525981
Thierry Jiao [Thu, 17 Dec 2020 17:30:27 +0000 (18:30 +0100)]
Update ServiceHandler to send service notification
- Update the methods service-create and delete-service in order to
notify the execution state by using the
class Publisher (nbinotifications)
- Update the classes PceListenerImpl, RendererListenerImpl to also
notify the execution state
- Update ServicehandlerImplTest by adding mock for the class Publisher
JIRA: TRNSPRTPCE-343
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: I6c026d78e906a4de584bf73577ed173ea2d69f96
guillaume.lambert [Fri, 5 Mar 2021 17:36:32 +0000 (18:36 +0100)]
Improve lighty format message
JIRA: TRNSPRTPCE-343
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icc2b00decb0567174a88aa224df1fc35b4d9b254
guillaume.lambert [Thu, 4 Mar 2021 17:16:59 +0000 (18:16 +0100)]
Fix a few typo in lighty main
JIRA: TRNSPRTPCE-343
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I897b6bb035869e0d1f94db135c071f68ed346c9d
manuedelf [Tue, 12 Jan 2021 22:11:47 +0000 (23:11 +0100)]
NBI Notifications as karaf feature
- add a new maven module in features maven project
- update lighty with NBI notification:
- NBI notifications is optional and could be activated through command
line option -nbinotification
- restconf file configuration is now passed with -restconf command
line option
- add apache common-cli to ease the parsing of command line options
JIRA: TRNSPRTPCE-343
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ic28aef2705b5cd79277b56467727dedfe9b7b843
Thierry Jiao [Thu, 17 Dec 2020 17:04:59 +0000 (18:04 +0100)]
Add new Maven module to manage NBI Notifications
- Implement a new Maven module named nbinotifications containing classes
capable of communicating with Kafka server
- Add the class Subscriber capable of reading events from topics Kafka
- Add the class Publisher capable of writing events from topics Kafka
- Add yang file nbi-notifications to model the service notifications
- Implement a new RPC API named GetNotificationsService capable of
returning the notifications stored in a topic Kafka
- Implement a new RPC API named publishNotificationService in charge of
publishing a message in Kafka topic
- Add a listener to the RPC GetNotificationsService
- Add new blueprint in nbinotifications
- Add unit tests to check the functionning of nbinotifications classes
- Update pom.xml to implement the new module nbinotifications
JIRA: TRNSPRTPCE-343
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: I74298292034e4a158b27dd5db47e63918026684b
Gilles Thouenon [Wed, 10 Mar 2021 15:37:19 +0000 (16:37 +0100)]
Set port states in portMapping
- set the administrative and operational states of a port in the mapping
object
- update functional tests accordingly
JIRA: TRNSPRTPCE-415
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I2fd0ac50fe23275e5136577c538262d4203c300a
Gilles Thouenon [Wed, 10 Mar 2021 15:32:44 +0000 (16:32 +0100)]
Update port-mapping model with port states
Add operational and administrative states of the port in the mapping
list
JIRA: TRNSPRTPCE-414
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I18b91a6d5e4110af80eca5f59549842376342cdf
guillaume.lambert [Mon, 8 Mar 2021 15:04:50 +0000 (16:04 +0100)]
Fix some scripts shebang
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I57647040c9e386bee2b63cd7e7822874dd66154e
Guillaume Lambert [Tue, 9 Mar 2021 14:23:20 +0000 (15:23 +0100)]
Add a checkbashisms tox profile
to identify potential bashisms in tests scripts
and ensure compatibility with dash, MAC OS X and BSD shells.
https://wiki.ubuntu.com/DashAsBinSh
https://mywiki.wooledge.org/Bashism
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I32acb2721f828bbfb283089aad5dbd446b662cd2
Guillaume Lambert [Wed, 10 Mar 2021 08:36:10 +0000 (08:36 +0000)]
Merge "Adapt PCE to compute a 400GE path"
Gilles Thouenon [Mon, 8 Mar 2021 14:01:05 +0000 (15:01 +0100)]
Upgrade honeynode 2.2.1 simulator version
- node emits a change-notification when status of a port changes (and
only on this case)
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Id5c1a922aa419677bacb593009f29b967d9f87a4
Shweta Vachhani [Thu, 14 Jan 2021 18:23:56 +0000 (13:23 -0500)]
Updated OLM module to support 7.1 devices
1) PM retrieval added for 7.1.0 models
2) Added new power management class for 7.1.0 models
3) Updated power management code to support hybrid network
4) Fix interface creation issue in renderer
5) rename OlmUtils22 class to OlmUtils221
JIRA: TRNSPRTPCE-381
Signed-off-by: Shweta Vachhani <sv111y@att.com>
Change-Id: I282825df61fe3f469ca5af507a67a96d0b3aedfb
Guillaume Lambert [Mon, 8 Mar 2021 08:20:21 +0000 (08:20 +0000)]
Merge "Fix topology link and service update"
Christophe Betoule [Thu, 11 Feb 2021 11:24:03 +0000 (12:24 +0100)]
Adapt PCE to compute a 400GE path
- on a simple openroadm-topology with only tpdr-400GE
- in PceCalculation, remove boolean returned by validateNode() and
validateOtnNode() since not used anywhere
- inject PortMapping instance in several PCE classes to retrieve
if-capabilities from portmapping in order to prune invalid nodes from
openroadm-topology
- add a new isTpWithGoodCapabilities() method in PceOpticalNode class to
check the node capabilities with regards to the type of service to
compute
- adapt blue-print to inject portmapping instance
- adapt PCE UT mocking PortMapping instance in all adequate constructors
JIRA: TRNSPRTPCE-372
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I02e8de3689d1df0b55a8018dd4f629429f6deb2b
Gilles Thouenon [Tue, 9 Feb 2021 18:09:43 +0000 (19:09 +0100)]
Manage 400G in portmapping and topologies
- retrieve if-cap-type from port-capabilities from device to populate
portmapping
- add protection in otn-topology when building TP if if-cap-type absent
from mapping
- manage 400G if-cap-type case in otn-topology
JIRA: TRNSPRTPCE-373
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iaf0e50f76da91f3815c99d9e7f0107f18dc0ddc7
guillaume.lambert [Wed, 24 Feb 2021 09:19:10 +0000 (10:19 +0100)]
Improve honeynode installation process in tox
- update install_honeynode.sh script to allow an installation
per version or a list of versions as argument(s)
rather than forcing the installing of all versions systematically.
- remove honeynode installation from tox gnpy profile
since gnpy test does not use any simulator.
- fix flexgrid placement in tox.ini (it should be with 2.2.1 profiles)
- split honeynode installation in 2 lines inside tox.ini
so that the called profiles only install the honeynode version(s)
that they need.
This spares ressources and time on the gate and prevent
the installation of version 7.1, which is currently not used.
JIRA: TRNSPRTPCE-368
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic66c47a31b48ae5f04a9188222442729a76ee0c9
guillaume.lambert [Wed, 24 Feb 2021 08:45:25 +0000 (09:45 +0100)]
Small improvement in PceGraph
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iae9b0a8df359a75c0d98c744cf296d33ad4e4726
Errea Moreno, Javier [Fri, 19 Feb 2021 12:14:10 +0000 (13:14 +0100)]
Fix topology link and service update
- Include nodeId+TpId as the key of the topology changes map
- This will fix bug -> wrong nodes/links being updated
JIRA: TRNSPRTPCE-400
Change-Id: I30006e199d4a30bc8cf974995a478a7ab49fc445
Signed-off-by: Javier <errea@eurecom.fr>
Guillaume Lambert [Tue, 23 Feb 2021 15:24:19 +0000 (15:24 +0000)]
Merge "Update Netconf dependencies version"
Guillaume Lambert [Tue, 23 Feb 2021 14:31:40 +0000 (14:31 +0000)]
Merge "Small improvement in Xponder-in/out link creation"
guillaume.lambert [Tue, 23 Feb 2021 14:27:57 +0000 (15:27 +0100)]
Update Netconf dependencies version
Netconf is now a MRI project and do not use anymore SANPSHOT versions.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ied4ad625a4448c752a5221612fe14e9145794785
Guillaume Lambert [Tue, 23 Feb 2021 14:22:22 +0000 (14:22 +0000)]
Merge changes from topic "nbinotification"
* changes:
Honeynode for 7.1 devices
Fix grep feature name in test_utils.py
Guillaume Lambert [Tue, 23 Feb 2021 10:49:25 +0000 (11:49 +0100)]
Small improvement in Xponder-in/out link creation
JIRA: TRNSPRTPCE-397
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I909000695248045af7e53f0c7b72af307233f1cb
Guillaume Lambert [Tue, 23 Feb 2021 10:35:19 +0000 (10:35 +0000)]
Merge "Add protection on Xponder-in/out link creation"
manuedelf [Wed, 10 Feb 2021 10:38:02 +0000 (11:38 +0100)]
Honeynode for 7.1 devices
- update install_honeynode.sh script to install honeynode for devices
7.1
- create tests/honeynode/7.1 directory
JIRA: TRNSPRTPCE-368
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Iae5a5930fe2276e4eb6201ae559f02612c8c070b
manuedelf [Wed, 17 Feb 2021 18:05:11 +0000 (19:05 +0100)]
Fix grep feature name in test_utils.py
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I244605777b81db1a0016b65742f95a9ea356ea72
Guillaume Lambert [Tue, 23 Feb 2021 10:03:22 +0000 (10:03 +0000)]
Merge changes Ib173fc1f,I81b1016b,I159835f7,Ifb870561,Id642171b
* changes:
disable PMD/CPD checks in 2 portmapping classes
Add portmapping methods to fill XpdR LCPs maps
Fix usage of deprecated method in portmapping
Fix+align portmapping protections and log messages
Add a portmapping method to retrieve Xpdr port2
Christophe Betoule [Thu, 11 Feb 2021 09:30:00 +0000 (10:30 +0100)]
Add protection on Xponder-in/out link creation
- avoid NPE when attempting to create an xponder-in/out link terminating
on an unexisting TP
- remove unnecessary log message
JIRA: TRNSPRTPCE-397
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I0f5ce99078872a487dfcd28f9f29f522c329079c
manuedelf [Mon, 8 Feb 2021 21:35:38 +0000 (22:35 +0100)]
GNPy client refactor
- Put GNPy api consumer in a specific package
- Remove hard-coded base url, username and password by putting
paramteres in blueprint configuration file (but still hardcoded in
lighty)
- Use jersey client package for requesting GNPy
- Use customized jackson serializer/deserialize as a temporary
workaround while waiting jackson support in yang tools
https://git.opendaylight.org/gerrit/c/yangtools/+/94852
- Update unit tests
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I28cba22c7df7ffa419d205c024e8e5e5bb909650
manuedelf [Thu, 4 Feb 2021 14:34:08 +0000 (15:34 +0100)]
JsonStringConverter in GNPy
Replace ServiceDataStoreOperations with use of generic
JsonStringConverter while generating the payload for GNPy request api.
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I7f0d460188a9f5eced0628957c79bc58514d7677
manuedelf [Thu, 4 Feb 2021 09:47:08 +0000 (10:47 +0100)]
Add generic json String converter
In order to replace DataStoreServiceOperations in PCE, create a generic
json string converter in common module.
This converter will be used for serialization in nbi notifications
module.
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I8df37176a349668d5c9191481b9896c95013925a
manuedelf [Thu, 4 Feb 2021 14:22:19 +0000 (15:22 +0100)]
Fix Gnpy functional tests
Update topology file
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I2a832a2800c9d8eb3f3e86bd9a22f1890c888ae5
Guillaume Lambert [Tue, 9 Feb 2021 10:49:25 +0000 (10:49 +0000)]
Merge changes Ifd9a205e,I5d358413,I4f693297
* changes:
Rename TAPI UT class name
Align tapi topology states on OOR topology ones
Update topology input files for Tapi topology UT
Guillaume Lambert [Mon, 8 Feb 2021 16:53:54 +0000 (16:53 +0000)]
Merge changes I8295bb63,I628ef618,Ic7ebdea9,I21faea97
* changes:
Add a portmapping putXpdrLcpsInMaps method
Add a portmapping method to create Xpdr LCP names
Improve portmapping LCP names creation process
Add a portmapping method to map degrees
guillaume.lambert [Wed, 27 Jan 2021 15:07:11 +0000 (16:07 +0100)]
disable PMD/CPD checks in 2 portmapping classes
The issue is already reported by a FIXME comment in the code.
The code is effectively similar but the types are different
since they are related to 3 different OpenROADM versions.
Using generics in this case is not helpful.
JIRA: TRNSPRTPCE-284
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib173fc1f701b152f0028740f654bae959ce89725
guillaume.lambert [Fri, 29 Jan 2021 12:45:55 +0000 (13:45 +0100)]
Add portmapping methods to fill XpdR LCPs maps
JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I81b1016b032cb540440bc353fcf848a666b85536
Gilles Thouenon [Thu, 4 Feb 2021 14:18:38 +0000 (15:18 +0100)]
Rename TAPI UT class name
JIRA: TRNSPRTPCE-395
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ifd9a205e50526211ec63cd6b4c3c366a786a7bd0
Gilles Thouenon [Tue, 2 Feb 2021 17:56:19 +0000 (18:56 +0100)]
Align tapi topology states on OOR topology ones
- convert administrative and operational states read from openroadm and
otn topologies to tapi states. Since tapi link is bidirectional, adapt
ConvertORTopoToTapiTopo and TapiTopologyImpl classes to take into acount
also states of opposite link (need to introduce Map instead of List in
some treatment)
- create new unitary tests in ConvertORTopoToTapiTopoTest.java to check
this new treatment
JIRA: TRNSPRTPCE-382
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I5d358413ecfcfcdb4066f1a3924b2a36e9049b3e
Gilles Thouenon [Tue, 2 Feb 2021 17:36:21 +0000 (18:36 +0100)]
Update topology input files for Tapi topology UT
- to take into acount Administrative and operational states present in
openroadm-topology and otn-topology, as well as flexgrid data
- fix issues in ConvertORTopoToTapiTopo.java when converting openroadm
supported interfaces to tapi supported layer protocoles (extend the
number of supported interfaces handled, use Set interface instead of
List to avoid possible duplication of entries)
- adapt UT consequently
JIRA: TRNSPRTPCE-393
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I4f69329734f9533eb8f1549ca08cd3dd631de597
Gilles Thouenon [Fri, 5 Feb 2021 12:46:14 +0000 (13:46 +0100)]
Fix usage of deprecated method in portmapping
Replace List by Map for McCapabilities treatment to avoid compilation
warnings.
JIRA: TRNSPRTPCE-396
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I159835f75ded4ca3952c569ab892fbe430799f85
guillaume.lambert [Thu, 28 Jan 2021 22:57:33 +0000 (23:57 +0100)]
Fix+align portmapping protections and log messages
JIRA: TRNSPRTPCE-284
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifb87056176028453c2f73fdf5010786242d3b0cc
guillaume.lambert [Thu, 28 Jan 2021 20:16:10 +0000 (21:16 +0100)]
Add a portmapping method to retrieve Xpdr port2
JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id642171bd70d991a33d6add56a16783dacc8fa8c
guillaume.lambert [Thu, 28 Jan 2021 13:53:54 +0000 (14:53 +0100)]
Add a portmapping putXpdrLcpsInMaps method
JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8295bb6352d2fb476a88af9490ea067f11048a75
guillaume.lambert [Wed, 3 Feb 2021 12:23:38 +0000 (13:23 +0100)]
Add a portmapping method to create Xpdr LCP names
JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I628ef6185f8df3166afd1cd5cbe40299119c48c7
guillaume.lambert [Wed, 3 Feb 2021 12:15:52 +0000 (13:15 +0100)]
Improve portmapping LCP names creation process
JIRA: TRNSPRTPCE-353
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic7ebdea90142831bfdab5ca45432f26defdde79b
guillaume.lambert [Tue, 2 Feb 2021 20:02:33 +0000 (21:02 +0100)]
Add a portmapping method to map degrees
that can be easily reused in the other methods
- use getDegreesMap() to retrieve the list of Degrees
- getPerDegreePorts() to generate a map of ports per degree
- remove unused argument from some methods
JIRA: TRNSPRTPCE-354
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I21faea97f7f599a2dc1dc11b9c94823369f435cb
Gilles Thouenon [Mon, 1 Feb 2021 16:39:16 +0000 (17:39 +0100)]
Fix variable name in tapi-topology
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3f94e494c4fffe61928df21f9394f4fbc725eb23
manuedelf [Wed, 3 Feb 2021 22:22:36 +0000 (23:22 +0100)]
Change maven download link
The previous seems down
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ic4f754e41981ec721f4f3cea07e27889c80dc4a1
Gilles Thouenon [Wed, 27 Jan 2021 08:30:29 +0000 (09:30 +0100)]
Reorganise dependency injection in ServiceHandler
- solve the ServiceHandler instance duplication issue when installing
T-API feature
- remove manuel instanciations from ServicehandlerProvider to let
blueprint manage object instantiation as a singleton
- remove ServiceHandlerOperations interface and its implementation that
was duplicating OrgOpenroadmServiceService interface, and chose that
latter in T-API module
- adapt constructors of service handler UT accordingly
- reorganise dependency injection in lighty to be aligned with blueprint
files
JIRA: TRNSPRTPCE-391
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I99d93bef801e24fe9972c277abbcdf5d28f8e781
Gilles Thouenon [Fri, 22 Jan 2021 11:02:07 +0000 (12:02 +0100)]
Set mandatory UUID in TAPI connectivity module
JIRA: TRNSPRTPCE-388
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I5b2e99a06461dee708324eb5677425b20ab704a8
Gilles Thouenon [Fri, 22 Jan 2021 09:54:41 +0000 (10:54 +0100)]
Fix the SIP uuid generation in TAPI topology
Avoid randomly generation of UUID for the ServiceInterfacePoint in TAPI
topology since it is used in the create-connectivity-service input RPC
JIRA: TRNSPRTPCE-389
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ieabeb3e8594af2cd1cc4f56396d07d8ab0b164a5
Gilles Thouenon [Tue, 19 Jan 2021 08:18:40 +0000 (09:18 +0100)]
ServiceDatastore instantiation in ServiceHandler
- Fix the way ServiceDatastoreOperation instantiation is performed in
ServiceHandler in order to avoid generation of NPE when getting service
from a possibly null object
- Adapt servicehanlder TU accordingly
JIRA: TRNSPRTPCE-390
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I06e5187dddf0157cdd4f1d7cab6c73833d1b9420
Gilles Thouenon [Mon, 1 Feb 2021 10:10:02 +0000 (11:10 +0100)]
Bump odlparent to 8.1.0 and mdsal to 7.0.5
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I4cbe081300b2409144f3e8e28c315dad740e62c0
Errea Moreno, Javier [Fri, 18 Dec 2020 13:45:03 +0000 (14:45 +0100)]
NetworkModelListener: handling TopologyUpdates
- Update of service state affected by topology update
- Added state to PathDescription elements
- Update PathDescription according to topology update notification
- Fixed test_pce.py by adding state to link in tests 21 & 23
JIRA: TRNSPRTPCE-363
Change-Id: Ic7e6a2f2abdfb70361ac251e3d44dc8505910409
Signed-off-by: Javier <errea@eurecom.fr>
Errea Moreno, Javier [Thu, 19 Nov 2020 11:15:27 +0000 (12:15 +0100)]
Stateful PCE module
- PCE changes to consider link & node states on path & graph calculation
- Modify PCE tests to include admin & oper state in node & link creation
- Added link and node states in topologies sample config xml file
- Set states for nodes, links and TPs in otn-topology to fix TAPI tests
JIRA: TRNSPRTPCE-361
Change-Id: I34db90b2fc3bf5d176f3a5aeb5dc83e9bfe66432
Signed-off-by: Javier <errea@eurecom.fr>
Errea Moreno, Javier [Wed, 18 Nov 2020 12:49:09 +0000 (13:49 +0100)]
NetworkModelListener implementation (interface D)
- TopologyListener in ServiceHandler to receive topology notifications
- Send notifications from NetworkModel to ServiceHandler
- Edited Rdm2CpdrLink.java to add states to links (forgotten before)
JIRA: TRNSPRTPCE-359
Change-Id: I56a4b2eb8a2bac2f7dd877821fca5aee0c27e500
Signed-off-by: Javier <errea@eurecom.fr>
Errea Moreno, Javier [Mon, 16 Nov 2020 17:50:20 +0000 (18:50 +0100)]
Interface D creation. NetworkModel->ServiceHandler
- Added common-ord-topology-types.yang and networkmodel.yang
- Created empty NetworkModelListener in Service Handler module.
- Initialization of Network model listener.
- Modified servicehandler blueprint and ServicehandlerImplTest.java
- Added models to TPCEUtils.java (lighty)
- Added NetworkModelListenerImpl to the controller start up process
JIRA: TRNSPRTPCE-359
Change-Id: I25e7b3f28741386c3d2b38ad49a04d7d4b304597
Signed-off-by: Javier <errea@eurecom.fr>
Errea Moreno, Javier [Fri, 13 Nov 2020 16:51:15 +0000 (17:51 +0100)]
Update openroadm-topology layer based on NETCONF event
- UpdateOpenRoadmNetworkTopology in NetworkModelServiceImpl.java
- Added getTpofNode function to OrdLink.java to add state to R2R links
- Added call to the update function in DeviceListener.java
- Fix relation chain issues
JIRA: TRNSPRTPCE-358
Change-Id: I36558408c21fd7f598711eeb8acaab28c8f5c58a
Signed-off-by: Javier <errea@eurecom.fr>
Errea Moreno, Javier [Fri, 13 Nov 2020 09:25:30 +0000 (10:25 +0100)]
Stateful OpenROADM topology layer
- On topology population, states of nodes & links are included
- Modified test_topology.py to take into account admin and oper states
JIRA: TRNSPRTPCE-351
Change-Id: If2c8d2f110c851e612c78d7095f514f5e26c1ac0
Signed-off-by: Javier <errea@eurecom.fr>
Errea Moreno, Javier [Thu, 12 Nov 2020 14:07:04 +0000 (15:07 +0100)]
NETCONF event handling
- DeviceListener processes NETCONF events from CircuitPack change
JIRA: TRNSPRTPCE-350
Change-Id: I20a8cf392dbf2f80560a7aaa341a1eef6d9c91bb
Signed-off-by: Javier <errea@eurecom.fr>
Gilles Thouenon [Fri, 15 Jan 2021 10:56:02 +0000 (11:56 +0100)]
Fix resource deletion issue in openroadm-topology
JIRA: TRNSPRTPCE-383
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I99b759d9b0881f5aa1ce49864ae6f14afe361e12
manuedelf [Mon, 21 Dec 2020 17:58:05 +0000 (18:58 +0100)]
Update PCE-GNPy for flexgrid
Remove use of wavelength to createPathConstraints in GnpyServiceImpl.
Add new method in GridUtils to get N value from frequency index.
Add new map in GridConstant to get spectral width slot number from rate.
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I7d4aa898a72300db8963edc71c5fe451e1cd0a1d
manuedelf [Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)]
Refactor to remove useless wavelength reference
As now we are using frequencies and all information about allocated
frequencies are provided by pce, refactor code to remove useless
wavelength references.
- in order to avoid too much parameters in methods from renderer and
common, add a new class SpectrumInformation which contains width, min
freq, max freq, wavelength number (for 1.2.1), center freq, lower
spectral slot number, higher spectral slot number. This class also
contains a method to generate connection name and lcp name from
parameters
- update constructors of crossconnect and openroadminterface by
replacing parameters like width center freq, lower and higher spectral
slot number with SpectrumInformation parameter
- remove duplicated method
- remove FixedFlex and Flexgrid as they are no more needed.
- rename GRID_FREQUENCY_PRECISION to FIXED_GRID_FREQUENCY_PRECISION and
add FLEX_GRID_FREQUENCY_PRECISION as precision is not the same for fixed
and flex grid
- add initSpectrumInformationFromServicePathInput in GridUtils to
instanciate SpectrumInformation object from ServicePathInput
- update blueprint files
- update unit tests to pass the compilation (no refactoring done here to
improve unit tests)
- update test_flexgrid, set wavelength number to 0 (as we are in
flexgrid mode) and slot number to be coherent with frequencies
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I6982ffecbba0ab84dde224698a2673588c906845
manuedelf [Fri, 18 Dec 2020 17:26:27 +0000 (18:26 +0100)]
Update connection and interface name
As now we allocate frequencies instead of wavelength, change connection
and interface format name by replacing wavelength reference by lower
spectral slot number and higher spectral slot number.
For example: SRG1-PP1-TXRX-DEG1-TTP-TXRX-1 becomes
SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768
XPDR1-NETWORK1-1 becomes XPDR1-NETWORK1-761:768
- add lower and higher spectral slot number in signature methods of
crossconnect, olm, ModelMappinUtils, openroadminterface,
openroadmfactory
- add some log info
- update ServicePathInput and ServicePowerSetup in MappingUtils with
frequencies, spectral slot number and modulation format
- add new map to get slot width from service rate and modulation format
in GridConstant
- add methods in GridUtils to get lower and higher spectal slot number
from frequency
- update unit tests to take into account the new format name
- update functional tests to take into account the new format name
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I98f62491f2720a84d4fdc8bd189b0a123ab5f0cf
manuedelf [Fri, 18 Dec 2020 07:26:27 +0000 (08:26 +0100)]
Use slot width granularity in PCE
Adding a new constraint in spectrum assignment for path calculation:
slot width granularity from mc capabilities. If for node, slot width
granularity is equals to 50GHz then spectrum assignment will be done
in fixed mode.
- Add new method to PceNode interface and its implementation to get
slot width granularity.
- Add new method to MappingUtils to get mc capabilities for a node.
- Update unit tests
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I84356d45c1b8652a05fee0ef66aa53b50b1de5b0
manuedelf [Tue, 15 Dec 2020 07:17:39 +0000 (08:17 +0100)]
Add methods to GridUtils
Add getCentralFrequencyWithPrecision and computeCentralFrequency.
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I2a451124344082dbf1fbb5bd5ff8e1d31e717c47
manuedelf [Mon, 14 Dec 2020 09:55:05 +0000 (10:55 +0100)]
New version of transportpce common types
- Update grouping olm-renderer-input, adding min, max frequencies
lower spectral slot number and higher spectral slot number
- Update group olm-renderer-input, replacing slot-width with width
- Fix center-freq unit
- Update import in common, lighty, olm and renderer module
- Update setPower in PowerMgmtImpl as now we use width instead of
slot-width
- Update variable name in method signature in OpenRoadmfactory,
OpenRoadmInterface221 and DeviceRendererServiceImpl as now se use
width instead of slot-width
- Update createMCInterface and createNMCInterface as now we use width
instead of slot-width
- Update functional test test_flexgrid to be compliant with use of width
instead of slot-width
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I6103c7549aacf341201a45dbe1b79c94a469a706
manuedelf [Fri, 11 Dec 2020 15:33:57 +0000 (16:33 +0100)]
Networkmodel class renaming
Rename NetworkModelWavelengthService, NetworkModelWavelengthServiceImpl
and NetworkModelWavelengthServiceTest to FrequenciesService,
FrequenciesServiceImpl and FrequenciesServiceTest as now we manage
frequencies. Update reference in blueprint file and classes using one of
those classes.
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I78090ebab0b850ce78d4d8bf7a3ba43887a786bc
manuedelf [Fri, 11 Dec 2020 15:21:45 +0000 (16:21 +0100)]
Network model add enable wavelength unit test
- Enable and fix NetworkModelWavelengthServiceTest.
- Remove no more used PathDescriptionUtils test class
- Add a stub yang model for path-description in test-common to define
path description as a container and use it to parse
path_description.json test file. Using a json file avoid to have big
test classes to instantiate yang object.
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: If843edb8116cb7ac60cffa3cd25544e9a251c88a
manuedelf [Fri, 11 Dec 2020 15:04:34 +0000 (16:04 +0100)]
Test-common module update
Update test-common module to be able to deserialize json for yang object
that are not data object (notification, rpcdata).
- change parent to mdsal bing parent to be able to generate classes from
yang files : today converter can only parse json for data object not
notification or rpcdata. A temporary workaroud is to add stub model yang
data object.
- replace getBindingToNormalizedNodeCodec by getBindingDOMCodecServices
to have all the methods of BindingDOMCodecServices.
TODO: clean converter to use methods from BindingDOMCodecServices
and focus converter on parsing/writing json or xml file for data
object, notification or rpcdata.
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I201060182ffe6434ffe837198d84e44c35d237c5
manuedelf [Tue, 8 Dec 2020 17:41:21 +0000 (18:41 +0100)]
Flexgrid for pce and network model
- add ServiceRateConstant class in common module to centralize service
rate Uint32 format.
- update GridConstant with maps (service type and nb slots, service rate
and modulation format, service rate-modulation format and frequency
width) and constant for irrelevant wavelength number.
- add methods in GridUtils.
- rename methods in NetworkModelWaveLengthService to be compliant with
frequencies.
- disable NetworkModelWaveLengthService unit tests.
- move some methods from NetworkModelWaveLengthServiceImpl to
OpenRoadmTopology util class in network model.
- update pce with flexgrid spectrum assignment computation.
- update pce unit tests.
- add getBitSetData method to PceNode and remove checkWL method.
- update PceNode implementations (PceOtnNode and PceOpticalNode).
- rename methods in pce to be compliant with frequencies.
- update some log messages to be coherent with frequencies.
- add minFrequency and maxFrequency to PceResult.
- update functional tests.
- update topology test files set freq map value to have the smallest
lambda on the higher index of the freqmap.
About "disable NetworkModelWaveLengthService unit tests":
some updates are needed in test-common: path-description is a
grouping and is used only in notification. DataObjectConverter converts
only data so to be able to Deserialize path-description from json file
in unit tests, a solution could be to add a dummy yang model in
test-common with container using path-description.
JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ie22761e535e0669f614ac18ea801b5dac75dd362