Javier Errea [Wed, 3 Feb 2021 15:39:30 +0000 (16:39 +0100)]
TAPI Netconf Topology Listener
- TAPI network model service equiv. to Network Model module
- TAPI blueprint modification.
- Lighty module initializes TAPI accordingly
- TAPI PortMappingListener implementation
- TAPI topology context population: nodes and links
- TAPI sip context population
- TAPI rdm2rdm link creating with LLDP
JIRA: TRNSPRTPCE-385
Change-Id: I70a68c0cd6156da53cb09ec84d25f600e4d31c87
Signed-off-by: errea <errea@eurecom.fr>
Javier Errea [Wed, 3 Feb 2021 12:37:20 +0000 (13:37 +0100)]
Initial OR-TAPI mapping: Services
- OR service -> TAPI connectivity service mapping
- ConnectivityService utils class
- TAPI context extended to update Connectivity context
- New service: ServiceDataStoreOperations in ServiceHandler blueprint
- 2 new operations in ServiceDataStoreOperations
- TAPI blueprint uses ServiceDataStoreOperations service
- Lighty modifications to create TAPI provider correctly
- Added removal of CEPs in getTopologyDetailsOutput
JIRA: TRNSPRTPCE-425
Change-Id: Ib146a85124359b31fc3c46f09b433a0c9daabfb3
Signed-off-by: errea <errea@eurecom.fr>
Javier Errea [Wed, 3 Feb 2021 11:17:21 +0000 (12:17 +0100)]
Initial OR-TAPI mapping: Topology
- Creation of T0 - Full Multi-layer topology
- Mapping OR topology to Full TAPI topology on feature install
- Store Full TAPI Topology in T-API context
- ConvertORTopoToTapiFullTopo.java used by the new mapping
- Modification of TAPI node creation: added E_ODU and I_ODU
- Mapping logic from Figure 6-9 of tapi-reference guide
- Added "mandatory" fields to tapi nodes and topology
- Removed CheckTP for OTN nodes. As it was forcing to do
the OR-TAPI mapping only to the OTN nodes associated
with XPDR links
JIRA: TRNSPRTPCE-384
Change-Id: I0d69242cc586c01d4a55c936be60a372176885be
Signed-off-by: errea <errea@eurecom.fr>
Gilles Thouenon [Wed, 14 Apr 2021 13:27:21 +0000 (15:27 +0200)]
New functional test for device change notification
- Add a new functional test suite to verify transportpce behavior when a
NETCONF device sends a change-notification related to an external
traffic port state change. Such a notification must update the
portmapping, which must also update some termination point status on
topologies. If the termination point supports a service, the status of
the service may also change.
- adapt tox.ini file with installation of honeynode 7.1 and activation
of this new functional test suite.
JIRA: TRNSPRTPCE-434
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I143fe79228472cab58038f932a840e519c5606ac
Gilles Thouenon [Tue, 13 Apr 2021 07:12:17 +0000 (09:12 +0200)]
Change way to start simulators
- change way to import modules from common and remove symbolic folder
links
- create a single flat simulators file containing all simulators
configurations in order to be able to launch topology configurations
composed of node devices of different versions
- adapt python test files accordingly
- create specific log directory for simulators in common
JIRA: TRNSPRTPCE-434
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I094d2dd844b0591b0012fd10395576cca147b54a
Gilles Thouenon [Tue, 9 Feb 2021 18:20:37 +0000 (19:20 +0100)]
Sample of 7.1 device configuration for tpdr-400G
- add xml files of initial operational datastore for 7.1 tpdr-400G
usable by honeynode simulator
JIRA: TRNSPRTPCE-368
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I559e1b9a63d0a05dee35b9d59155b827b1c3700c
Gilles Thouenon [Thu, 15 Apr 2021 07:32:42 +0000 (09:32 +0200)]
Adapt existing honeynode configs to device 7.1
Necessary to run new functional test suites with device in version 7.1.
Fix faceplate-label values in ROADM configurations files.
JIRA: TRNSPRTPCE-437
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I4983fc3a054b81b83325b5229377f2ca98cfd506
Javier Errea [Wed, 3 Feb 2021 10:30:32 +0000 (11:30 +0100)]
T-API context creation on feature install
- TAPI context java class (create & get context)
- Instantiation in Tapi provider
- Modify module structure -> New connectivity Package
- Rename TapiImpl -> TapiConnectivityImpl
JIRA: TRNSPRTPCE-424
Change-Id: Icf533c4217cf0daf40cf6715339858c9aaa2a738
Signed-off-by: errea <errea@eurecom.fr>
Gilles Thouenon [Sun, 25 Apr 2021 09:14:42 +0000 (11:14 +0200)]
Update lighty with device 7.1 models
Update LightyController initialization with generated java bindings to
manage an OpenROADM device in version 7.1.
JIRA: TRNSPRTPCE-442
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ibdd2893716e41d275e4d056a1b35b50b28d2de10
guillaume.lambert [Sat, 24 Apr 2021 08:31:32 +0000 (10:31 +0200)]
Decrease docs tox profiles logs verbosity
This will ease gate failures analysis.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I322e8fa0c621e54edee89d39bba29a2a843741e6
Guillaume Lambert [Fri, 23 Apr 2021 09:18:07 +0000 (09:18 +0000)]
Merge "Prepare use of Lighty core dev SNAPSHOTs"
guillaume.lambert [Fri, 2 Apr 2021 09:23:06 +0000 (11:23 +0200)]
Prepare use of Lighty core dev SNAPSHOTs
- create a shell script to build lighty core dev SNAPSHOTs
(not available in maven central)
- prefill parameters to use 14.0.1-SNASPHOT
- update README.md and other materials
JIRA: TRNSPRTPCE-442
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I754efa99c4afd0b8861af62cab386170de9757c9
Guillaume Lambert [Thu, 22 Apr 2021 19:11:23 +0000 (19:11 +0000)]
Merge "Upgrade honeynode sim for device 1.2.1 and 7.1"
guillaume.lambert [Fri, 2 Apr 2021 09:23:06 +0000 (11:23 +0200)]
Lighty support Silicon migration
- bump lighty pom to 14.0.0
- fix a few migration issues since Si SR0
- adapt tox.ini accordingly
- fix README.md
- force lighty use in tox
JIRA: TRNSPRTPCE-442
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If7124a7b93e4606037ffa25d4faff79deac023d9
(cherry picked from commit
450c421e16108c03a1278cfd9c112c09e2a04e1f)
Gilles Thouenon [Thu, 15 Apr 2021 11:16:52 +0000 (13:16 +0200)]
Upgrade honeynode sim for device 1.2.1 and 7.1
This new version of simulators allows having exactly the same behavior
as device 2.2.1 regarding the handling of port state change
notifications.
JIRA: TRNSPRTPCE-438
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie023c32024c3f31f95a80a9b32bdd191829ae9c6
Guillaume Lambert [Thu, 22 Apr 2021 15:16:48 +0000 (15:16 +0000)]
Merge "Fix function test PCE 400G return code"
Guillaume Lambert [Thu, 22 Apr 2021 14:20:54 +0000 (14:20 +0000)]
Merge "Update device transactions operation"
Shweta Vachhani [Tue, 20 Apr 2021 17:57:25 +0000 (13:57 -0400)]
Update device transactions operation
from put to merge in
1) Openroadm Interfaces
2) Openroadm cross-connects
3) OLM power updates
JIRA: TRNSPRTPCE-444
Signed-off-by: Shweta Vachhani <sv111y@att.com>
Change-Id: I1f7f29bdf189545d428d0baac7c2a218021d3e3e
guillaume.lambert [Tue, 20 Apr 2021 15:24:01 +0000 (17:24 +0200)]
Fix function test PCE 400G return code
The first test return code can shifted from 200 (OK) to 201 (created)
depending on the order that functional tests are run,
but also with or without lighty support.
JIRA: TRNSPRTPCE-442
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6bbc291acd0bc1a5f6bc3337fab8d7ebbe03400f
(cherry picked from commit
156b223e2ff116bea5834fc376090eac0ea1e75d)
Guillaume Lambert [Wed, 21 Apr 2021 12:28:42 +0000 (12:28 +0000)]
Merge "Bump deps to new Silicon dev versions"
Thierry Jiao [Wed, 14 Apr 2021 12:15:00 +0000 (14:15 +0200)]
Add nbinotifications feature documentation
add descriptions of nbinotifications feature
into the developper-guide and user-guide.
JIRA: TRNSPRTPCE-406
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: Ic27840223a3d3e13e93f4d572850f2fcd8097df3
guillaume.lambert [Mon, 19 Apr 2021 17:48:44 +0000 (13:48 -0400)]
Bump deps to new Silicon dev versions
org.opendaylight.odlparent * 8.1.0 -> 8.1.1
org.opendaylight.mdsal * 7.0.5 -> 7.0.6
org.opendaylight.netconf * 1.13.0 -> 1.13.1
https://docs.opendaylight.org/projects/integration-distribution/en/stable-silicon/platform-versions.html
This fixes the SSH issue described in NETCONF-765
an that occurs with some OpenROADM devices too.
JIRA: NETCONF-765 TRNSPRTPCE-441
Co-Authored-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: If166b3b40c80f1fa1cc69c1dfebc71d98db516e1
guillaume.lambert [Tue, 13 Apr 2021 09:43:42 +0000 (11:43 +0200)]
Make honeynode install script more robust
to connectivity issues.
They often happens in the gate.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8b1bfe31b22abccc2402ea24f2621f145617a987
guillaume.lambert [Tue, 13 Apr 2021 09:22:57 +0000 (11:22 +0200)]
Explicit unchecked conversions in networkmodel
to avoid compilation warnings.
JIRA: TRNSPRTPCE-430
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id8f08201c484aef895291aba517080a54866b391
Gilles Thouenon [Mon, 22 Mar 2021 13:27:00 +0000 (14:27 +0100)]
Add new UT for deviceListeners
- UT for each version of deviceListeners
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iff63e9e2634abc0e2ce174be132efac3004272f7
Gilles Thouenon [Thu, 18 Mar 2021 10:55:48 +0000 (11:55 +0100)]
Refactor network topologies listener of SH
- refactor the topology-update-result notification in
transportpce-networkmodel.yang model to be compatible with the new
topology updates implementation, and remove
transportpce-common-ord-topology-types yang module which is no longer
necessary
- refactor the NetworkModelListenerImpl class to be adapted to the new
notification format
- review version of State and AdminStates enums used in Service Handler
- convert incompatible versions of State and AdminStates in
ServiceDataStoreOperationsImpl class
JIRA: TRNSPRTPCE-421
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9ebe45902fcbf550a0b9452cfa957225d2abfb1a
Gilles Thouenon [Tue, 16 Mar 2021 10:35:58 +0000 (11:35 +0100)]
Update node-tp and link states on topologies
When a mapping is updated after reception of an administrative state
or operational state change from a device port, update associated node
TP and links in openroadm-topology and otn-topology.
- add in networkmodel a portmapping listener that listens to mapping
updates
- add a new updateOpenRoadmTopologies method in NetworkModelService to
manage topology updates from a given mapping
- remove updateOpenRoadmNetworkTopology that handled a change on a
circuit-pack (not present as it in port-mapping)
- implement the new updateTopologyShard method in TopologyUtils to
update tp and if need be links (usable for both openroadm and otn
topologies)
JIRA: TRNSPRTPCE-420
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I8de09921e5a938676348e83e4883d953c47c13cb
Gilles Thouenon [Sat, 13 Mar 2021 12:31:43 +0000 (13:31 +0100)]
Update portmapping YANG model
- refactor portmapping YANG model using grouping
- update all transportpce code consequently
JIRA: TRNSPRTPCE-419
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I840664243f1f9c7b6e1c886b7865e12b17657aa4
Christophe Betoule [Thu, 11 Mar 2021 14:41:51 +0000 (15:41 +0100)]
Set topology tp states from device port state
set tp states in openroadm-topology and otn-topology according to states
of device port coming from port-mapping.
JIRA: TRNSPRTPCE-416
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I562563059ec789702bddb848e38a2c12cf3b4640
Gilles Thouenon [Mon, 12 Apr 2021 07:22:47 +0000 (09:22 +0200)]
Fix bug in ODU interface creation for device 7.1
At the odu interface creation on a device 7.1, set the mandatory
testPattern leaf inside the maint-testsignal container.
JIRA: TRNSPRTPCE-431
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: If8fd1a94ad0607a29e257affbc3a9524bf5a64c3
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