transportpce.git
5 years agoReintroduce (ordm 2.2.1) Rdm2Rdm links in topo 73/81373/5
Gilles Thouenon [Thu, 4 Apr 2019 07:09:48 +0000 (09:09 +0200)]
Reintroduce (ordm 2.2.1) Rdm2Rdm links in topo

- complete portMapping with GE interfaces from lldp in CpToDegree
- delete mapping and node/link from topo when disconnecting device

Change-Id: I989e62523bf7a635f3b3ad2d5fa985fdabfcca4c
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoCode correction to integrate 2.2.1 devices in topo 72/81372/4
Gilles Thouenon [Wed, 3 Apr 2019 14:21:11 +0000 (16:21 +0200)]
Code correction to integrate 2.2.1 devices in topo

- change several device datastores from config to operational
- reactivate node deletion/portmapping deletion

Change-Id: I3c8ee105b977d12adbebc1116545fa04185013c8
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoPrepare NetworkModel to support ordm 2.2.x devices 71/81371/4
shweta [Tue, 2 Apr 2019 12:23:46 +0000 (14:23 +0200)]
Prepare NetworkModel to support ordm 2.2.x devices

Adapt topology modifications from change 80051
https://git.opendaylight.org/gerrit/#/c/80051/
They initially supported 2.2 openroadm devices and have been adapted to
support openroadm 2.2.1 devices.

Change-Id: Ia659c19b4f695d2054c0757b101d9e895108f957
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoBump project version to Sodium 04/81604/1
guillaume.lambert [Fri, 12 Apr 2019 13:04:58 +0000 (15:04 +0200)]
Bump project version to Sodium

Change-Id: Ic437ccde60d60f9f9449a334ddb29cf2868712c1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoupdate docs 33/81133/6
guillaume.lambert [Sat, 23 Mar 2019 00:03:02 +0000 (01:03 +0100)]
update docs

Change-Id: I992f3b64af3763ac51b1ec47cf250bc9a7bc1080
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoupgrade openroadm models to 2.2.1 32/81132/6
shweta [Fri, 22 Mar 2019 21:48:26 +0000 (17:48 -0400)]
upgrade openroadm models to 2.2.1

Added alarm and LLDP for 2.2.1

Change-Id: Ide21da84e6cec9c148cef3155471b8263133bf33
Signed-off-by: shweta <sv111y@att.com>
5 years agoMerge "PortMapping for device 1.2.1 and 2.2"
Guillaume Lambert [Thu, 21 Mar 2019 16:27:23 +0000 (16:27 +0000)]
Merge "PortMapping for device 1.2.1 and 2.2"

5 years agoPortMapping for device 1.2.1 and 2.2 50/81050/1
Christophe Betoule [Wed, 20 Mar 2019 16:40:15 +0000 (17:40 +0100)]
PortMapping for device 1.2.1 and 2.2

- detect openRODAM device version in NetConfTopologyListener.java
- add getNode method in PortMapping to get general node info
- disable LinkDiscovery for device 2.2 to alleviate exceptions

Change-Id: Id836a31e6a754d281acc237d46a121a0c6ae5d0e
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 years agoclean tests folder 45/81045/3
guillaume.lambert [Wed, 20 Mar 2019 16:12:08 +0000 (17:12 +0100)]
clean tests folder

- remove some useless files
- rationalize sample configs directory
- review sims port assignation to avoid that 2 different honeynode confs
  use the same port
- introduce some delimiters in nose tests files for Xtesting purpose

Change-Id: Ife26be63d2725f05cc8fb2dd76c439d5464d01bf
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoclean some files 94/80894/1
guillaume.lambert [Fri, 15 Mar 2019 11:19:22 +0000 (12:19 +0100)]
clean some files

remove useless trailing blanks and tabs

Change-Id: I6f70ff1599025fb8cbe44a6cd22ab0a2d8730b1b
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoMerge "fix renderer UT"
Guillaume Lambert [Fri, 15 Mar 2019 08:37:26 +0000 (08:37 +0000)]
Merge "fix renderer UT"

5 years agoMerge changes from topic 'ordm22'
Guillaume Lambert [Fri, 15 Mar 2019 08:36:30 +0000 (08:36 +0000)]
Merge changes from topic 'ordm22'

* changes:
  fix some warnings
  Fixed Issues with PCE
  Update Renderer Module
  clean yang files
  Sync Common folder

5 years agoDo not override mockito versions 58/80858/1
Robert Varga [Thu, 14 Mar 2019 15:57:01 +0000 (16:57 +0100)]
Do not override mockito versions

odlparent ships newer mockito, using that version fixes build
with JDK11.

Change-Id: I71328a9395e36f96a19ed08602f7017b97e8da8b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
5 years agofix renderer UT 52/80852/1
guillaume.lambert [Thu, 7 Mar 2019 17:01:03 +0000 (18:01 +0100)]
fix renderer UT

Change-Id: Ic68cf87cc9441d4bef4e887e68fd583f1f76e984
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix some warnings 01/80701/3
guillaume.lambert [Wed, 6 Mar 2019 17:14:03 +0000 (18:14 +0100)]
fix some warnings

Change-Id: If9e4228dda974760d7bccb2f85a950c299c3d377
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoFixed Issues with PCE 42/80842/1
Shweta Vachhani [Wed, 13 Mar 2019 17:35:30 +0000 (13:35 -0400)]
Fixed Issues with PCE

Change-Id: If01fe6b049f6ea6d225df46e8faee3ee8d0dc2de
Signed-off-by: Shweta Vachhani <sv111y@att.com>
5 years agoUpdate Renderer Module 80/78880/9
shweta [Wed, 12 Dec 2018 22:41:28 +0000 (17:41 -0500)]
Update Renderer Module

- introduce support for ordm 2.2
- update OLM unit tests to support render and common module changes
- update portmapping to trigger roadm-to-roadm link discovery with lldp

Change-Id: I955b00e903a1124a24668d27955bbc02cd5d651a
Signed-off-by: shweta <sv111y@att.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 years agoclean yang files 75/80475/4
guillaume.lambert [Wed, 19 Dec 2018 13:34:24 +0000 (14:34 +0100)]
clean yang files

remove tabs and trailing blank

Change-Id: I4ccea152ff4edf01a9a8ea6808c52b1f1120ebb1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoSync Common folder 66/78166/7
Dhruv Bhardwaj [Mon, 26 Nov 2018 18:51:56 +0000 (13:51 -0500)]
Sync Common folder

1. Updated transportpce-portmapping.yang to support device version
2. Added support for flex-grid (fixed mapping)
3. Network Transaction service
4. Cross Connect support for version 2.2
5. Interface support for version 2.2
6. Portmapping support for 2.2
7. Updated openroadm 1.2 yang models
8. Added openroadm 2.2 yang models

Change-Id: I1a5c1e2f93399c0cccb10f1db2d41b3052794dfd

5 years agoupdate MDSAL model to 0.13.2 90/80690/4
guillaume.lambert [Thu, 7 Mar 2019 09:37:31 +0000 (10:37 +0100)]
update MDSAL model to 0.13.2

this non-SNAPSHOT version now builds correctly.
(ietf-interfaces no more missing from nexus)

Change-Id: Ibf2914bfe647e173fe378f748ee52a02327d7e65
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix some sonar issues 09/80709/1
guillaume.lambert [Thu, 7 Mar 2019 09:05:55 +0000 (10:05 +0100)]
fix some sonar issues

Change-Id: I5fc4f68a23955b0dfac2e25dc70adbd8dc19b15f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix minor bugs in end2end tests 22/80522/6
Ahmed Triki [Thu, 21 Feb 2019 15:10:37 +0000 (16:10 +0100)]
fix minor bugs in end2end tests

- change the messages returned when a service is created and deleted
- change the timer in the case of creation and deletion of a service

Change-Id: I828b0371f71814e41b96f0888f948fe6b2b9b18b
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
5 years agorenderer unit test for neon 86/80686/2
Rami [Thu, 14 Feb 2019 14:17:59 +0000 (16:17 +0200)]
renderer unit test for neon

- reintroduce renderer UT by adapting them to Neon
- change check empty list to check null : deleteUseWL doesn't remove
elements from list but the type attributes that contains the WL list

Change-Id: Id855ef011fd1b11d2476bfa27fd25bd3aa3a2a3f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoupdate mdsal models version 87/80687/1
guillaume.lambert [Tue, 5 Mar 2019 14:58:29 +0000 (15:58 +0100)]
update mdsal models version

Change-Id: I3d50fadd5463d96280733ad51b66faf927eced00
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoRationalize poms 22/80422/1
guillaume.lambert [Wed, 20 Feb 2019 15:45:13 +0000 (16:45 +0100)]
Rationalize poms

- remove mdsal binding models + ietf and iana models versions.
  They are inherited from binding-parent.
- remove useless karaf4 related dependencies.

Change-Id: Ic3ca904175e134597cdc1331eb71c4dca723a6a7
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix renderer_service_path_nominal tests 97/80397/3
Ahmed Triki [Tue, 19 Feb 2019 17:06:44 +0000 (18:06 +0100)]
fix renderer_service_path_nominal tests

change the error message returned in case of non existing node
(ODL REST API modified with bump to Neon)

Change-Id: I25ce9c58e38ec4d9d9270f56faf22ccb2a11a8ea
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
5 years agofix minor bugs in portmapping 95/80395/3
Ahmed Triki [Tue, 19 Feb 2019 16:00:31 +0000 (17:00 +0100)]
fix minor bugs in portmapping

- comment out tests concerning the (obsolete) controller-config
- change the supporting-port id for the XPDRA (caused by E2E tests)
- change the error message returned in case of non existing node
  (ODL REST API modified with bump to Neon)
- fix tests index number

Change-Id: Id3cedfc8dd193a94633ee18d4514a5b905bbe770
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>
5 years agofix mdsal binding models 08/80408/1
guillaume.lambert [Wed, 20 Feb 2019 10:23:06 +0000 (11:23 +0100)]
fix mdsal binding models

downgrade mdsal binding models to 1.2.6 (non SNAPSHOT) and others ietf
or iana models to 0.13.6 and 1.0.6 so that they are aligned with mdsal
binding parent version 3.0.6 (neon SR0 target)

Change-Id: I5012741cbf1dd714474af7209199008c37b3649a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoupgrade mdsal models 75/80375/1
guillaume.lambert [Mon, 18 Feb 2019 19:15:24 +0000 (20:15 +0100)]
upgrade mdsal models

Change-Id: I4f739b40eed4d3bae52f17f18506e05d0f469bfe
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agodeactivate faulty unit tests 65/78465/6
guillaume.lambert [Tue, 12 Feb 2019 14:42:42 +0000 (15:42 +0100)]
deactivate faulty unit tests

Those unit tests now fails after neon bump.

Change-Id: I27144d6273fa6df6ccd42789a4bd5463afb2689d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agomv BP XML from org/opendaylight to OSGI-INF/ 24/80124/4
guillaume.lambert [Sat, 2 Feb 2019 23:21:17 +0000 (00:21 +0100)]
mv BP XML from org/opendaylight to OSGI-INF/

Blueprint XML files moved, following
https://wiki.opendaylight.org/view/Neon_platform_upgrade#Blueprint_declarations

find . -path '*/src/main/resources/org/opendaylight/blueprint/*.xml'
-execdir sh -c "mkdir -p ../../../OSGI-INF/blueprint; git mv {}
../../../OSGI-INF/blueprint" \;

Change-Id: I0421619ffd5116b919605c45fc474c938238b06f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump to Neon 58/78458/11
guillaume.lambert [Wed, 5 Dec 2018 14:28:54 +0000 (15:28 +0100)]
Bump to Neon

Upgrade poms core dependencies:

org.opendaylight.odlparent                      4.0.9
org.opendaylight.yangtools  yangtools-artifacts 2.1.8
org.opendaylight.mdsal      binding-parent      3.0.6
org.opendaylight.mdsal      mdsal-artifacts     3.0.6
org.opendaylight.controller mdsal-artifacts     1.9.0-SNAPSHOT
org.opendaylight.netconf    netconf-artifacts   1.6.0-SNAPSHOT
org.opendaylight.netconf    restconf-artifacts  1.9.0-SNAPSHOT

Migrate poms ietf and iana models dependencies:

org.opendaylight.mdsal.binding.model.ietf
    rfc6991-ietf-inet-types               1.2.6-SNAPSHOT
    rfc6991-ietf-yang-types               1.2.6-SNAPSHOT
    rfc7223                               1.2.6-SNAPSHOT

org.opendaylight.mdsal.model  ietf-access-control-list  0.13.6-SNAPSHOT
org.opendaylight.mdsal.model  ietf-packet-fields        0.13.6-SNAPSHOT

org.opendaylight.mdsal.model  iana-afn-safi   2013.07.04.15.6
org.opendaylight.mdsal.binding.model.iana iana-if-type  1.0.6-SNAPSHOT

Change-Id: I2675746b2c3d3202080907e6be0bcc59facce1ed
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoService-restoration implementation 59/79959/7
Martial COULIBALY [Mon, 28 Jan 2019 17:27:37 +0000 (18:27 +0100)]
Service-restoration implementation

First implementation of service-restoration rpc according to
openroadm-service documentation.

Change-Id: I6a8687b088c2e1fcb2d0d747ce46dd94f0ddc25e
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoreintroduce SP 1.6 in SH 84/79884/7
Martial COULIBALY [Thu, 24 Jan 2019 15:29:21 +0000 (16:29 +0100)]
reintroduce SP 1.6 in SH

- Backport all changes to Service Path in the 1.6 version
(Added container in path-description resources).
- Add service-feasability-check rpc.
- Add service-reconfigure rpc.

JIRA: TRNSPRTPCE-44
Change-Id: Ibe6fc57115d2fd0c7dedc54211440727b288f7ed
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoService-notification handling for serviceHandler 18/78218/33
Martial COULIBALY [Mon, 26 Nov 2018 16:19:10 +0000 (17:19 +0100)]
Service-notification handling for serviceHandler

- Modify RPC serviceCreate / serviceDelete/ serviceReroute
to add support for notifcation
- Add / Modify PCEListenerImpl and RendererListener class
to execute tasks after received notifications
- Modify SH provider to add notifcations listeners
for PCE and Renderer
- Add / Modify Junit Tests

JIRA: TRNSPRTPCE-50
JIRA: TRNSPRTPCE-71
Change-Id: I3000c7c7ed935dc51c7b68da5581b74445287024
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoService-notification handling for Renderer 92/78292/17
Martial COULIBALY [Thu, 29 Nov 2018 08:20:23 +0000 (09:20 +0100)]
Service-notification handling for Renderer

- Modify Renderer to send notifications to SH
- Modify Renderer service to implement RPCs ListenableFuture

JIRA: TRNSPRTPCE-50
Change-Id: I4ed3cc24814ac8c6ddf303d5fa3746de6389b7a5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoService-notification handling for PCE 91/78291/12
Martial COULIBALY [Thu, 29 Nov 2018 08:20:48 +0000 (09:20 +0100)]
Service-notification handling for PCE

- Modify PCE to send notifications to ServiceHandler
- Modify PCE to implement RPCs ListenableFuture

JIRA: TRNSPRTPCE-50
Change-Id: Ibc74ea8141284e545c44e87926acf49a150eac27
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoEnd-to-end functional tests 42/78542/9
Gilles Thouenon [Thu, 6 Dec 2018 08:46:42 +0000 (09:46 +0100)]
End-to-end functional tests

- adapt ROADM configuration files of honeynode with ots-oms interfaces
and SRG3
- adapt XPDR configuration files of honeynode with addition of Network2
port for XPDRC and bug correction in config of XPDRA
- add a new functional test suite that check the whole TransportPCE
modules  (with basic checks of renderer, topology, pce and service
handler for 'service' and 'roadm-line' connection-type)
- adapt tox.ini consequently
- bugs corrections on the end-to-end test suite

NB: with current version of TransportPCE code, some tests may fail:
- test_15 with test_17 and test_18
- test_16
- test_22 with test_23 and test_24
- test_47

Change-Id: I725e9021f3a6e8da768218de60882079c4c9ef6e
JIRA: TRNSPRTPCE-54
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agotrigger functional tests in jenkins 44/78544/29
guillaume.lambert [Fri, 7 Dec 2018 15:18:19 +0000 (16:18 +0100)]
trigger functional tests in jenkins

- merge tests/tox.ini with tox.ini by using setupdir variable.
  This way, functional tests can be launched from project root dir.
- adapt sphinx docs testenv consequently
- releng "tox-verify" macro does not bring any maven installation.
  Inside tox, check if mvn is present on the host system. If not,
  call a script to download and install it (yum package is obsolete).
- some tests are still expected to fail.
  forcing tox return codes to success.

JIRA: TRNSPRTPCE-14
Change-Id: I50db9e9894cc5792a0b63f3084bed157df41efe0
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump to odlparent 3.1.6 and yangtools 2.0.16 78/79878/1
guillaume.lambert [Thu, 24 Jan 2019 11:15:39 +0000 (12:15 +0100)]
Bump to odlparent 3.1.6 and yangtools 2.0.16

Change-Id: I992abf5412b128723a4ce764398e813072e2354a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump odlparent to 3.1.5 60/79060/4
Martial COULIBALY [Wed, 26 Dec 2018 09:52:49 +0000 (10:52 +0100)]
Bump odlparent to 3.1.5

Change-Id: I7db9b0b1043a81e55c8eb94693db07c7c8373160
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoFix testing dependency in olm/pom.xml 34/79534/2
Jonas MÃ¥rtensson [Tue, 15 Jan 2019 10:31:23 +0000 (11:31 +0100)]
Fix testing dependency in olm/pom.xml

Change-Id: Ia18a4a725e80bc88c7447d243b3d1f4a078e5776

5 years agofix javadoc warnings 41/78541/5
guillaume.lambert [Fri, 7 Dec 2018 14:07:51 +0000 (15:07 +0100)]
fix javadoc warnings

Change-Id: I5c2e5b9efe0db0a17708e5f5b90aa1aa7527ca72
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBug corrections in PCE 78/78378/10
Martial COULIBALY [Mon, 3 Dec 2018 13:19:36 +0000 (14:19 +0100)]
Bug corrections in PCE

Solve Bugs conerning PCE random selection on :
- ROADM-SRG node
- SRG-PP port

JIRA: TRNSPRTPCE-52
Change-Id: Ia04a62f419315239dab5170ffb874b58ab6224e5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agofix javadoc warnings 11/78411/4
guillaume.lambert [Tue, 4 Dec 2018 09:35:36 +0000 (10:35 +0100)]
fix javadoc warnings

Change-Id: If1c1a715e517ce9e431b0c693bebce3207982be8
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoUpdate stubRenderer 79/78379/4
Martial COULIBALY [Mon, 3 Dec 2018 14:37:40 +0000 (15:37 +0100)]
Update stubRenderer

Add NetworkModelWavelengthService to be able update
openraodm-topology especially the TPs used.

Change-Id: I743506baf4f621590e3257d76ca790129e56925c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBump TPCE dependencies 18/78318/1
guillaume.lambert [Thu, 29 Nov 2018 13:53:58 +0000 (14:53 +0100)]
Bump TPCE dependencies

Change-Id: I245f7915ce1f691359a273a5b7582b45d6814f5a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoBump to yangtools 2.0.13 04/78204/1
guillaume.lambert [Tue, 27 Nov 2018 09:57:10 +0000 (10:57 +0100)]
Bump to yangtools 2.0.13

Change-Id: I11b821a1b8182f5b6495048278f67b23813f6066
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoMerge "OLM unit testing update"
Guillaume Lambert [Mon, 26 Nov 2018 14:52:20 +0000 (14:52 +0000)]
Merge "OLM unit testing update"

5 years agoadded OSNR calculation logic into PCE 65/76665/6
shweta [Thu, 4 Oct 2018 21:50:56 +0000 (17:50 -0400)]
added OSNR calculation logic into PCE

JIRA: TRNSPRTPCE-51
Change-Id: I12c490d246c943dc5158c17e37911720d415c304
Signed-off-by: shweta <sv111y@att.com>
5 years agoOLM unit testing update 91/78091/2
doha.khaled [Thu, 22 Nov 2018 13:17:32 +0000 (15:17 +0200)]
OLM unit testing update

JIRA: TRNSPRTPCE-59
Change-Id: Ic513dd8d5e36fd35b436cd4d397d7f2eb80c8572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoSH RPC temp-service-create/delete 92/77992/6
Martial COULIBALY [Tue, 20 Nov 2018 16:34:31 +0000 (17:34 +0100)]
SH RPC temp-service-create/delete

Handle missing RPC in Service Handler :
- temporary-service-create
- temporary-service-delete

JIRA: TRNSPRTPCE-53
Change-Id: I2b00e4deb89777ebf4b7b0849852cfe89f029c9c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoCorrect topology test 01/77801/9
Martial COULIBALY [Wed, 14 Nov 2018 16:52:26 +0000 (17:52 +0100)]
Correct topology test

Modify topology tests to only test if XPONDER had at least 2 TPs:
- 1 XPONDER-CLIENT
- 1 XPONDER-NETWORK

JIRA: TRNSPRTPCE-34
Change-Id: Id2caff13818f13e17d830a23f6fa78dc3f6da7f3
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoROADM To ROADM Path Calculation on unidir ports 35/77935/8
Martial COULIBALY [Fri, 16 Nov 2018 16:11:03 +0000 (17:11 +0100)]
ROADM To ROADM Path Calculation on unidir ports

JIRA: TRNSPRTPCE-52
Change-Id: Ied8e96d96d52636c11325c2f2b2b6c8c2eebca6c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoinitial olm unit testing commit 49/77849/2
doha.khaled [Thu, 15 Nov 2018 06:14:30 +0000 (08:14 +0200)]
initial olm unit testing commit

JIRA: TRNSPRTPCE-59
Change-Id: I0bd11fa7df291891acab856e5e4b666b9b23caa9

5 years agoMerge "ROADM To ROADM Path Calculation"
Guillaume Lambert [Wed, 14 Nov 2018 10:15:25 +0000 (10:15 +0000)]
Merge "ROADM To ROADM Path Calculation"

5 years agoUpdate Functional tests for SP1.6 92/77692/3
Martial COULIBALY [Mon, 12 Nov 2018 16:04:23 +0000 (17:04 +0100)]
Update Functional tests for SP1.6

Change-Id: Ifd8df94c618dcb5d43cebf8ef1fcba5204c94c90
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoReintroduce SP 1.6 models in TPCE 24/77324/8
Martial COULIBALY [Fri, 21 Sep 2018 14:45:23 +0000 (16:45 +0200)]
Reintroduce SP 1.6 models in TPCE

JIIRA:TRNSPRTPCE-44
Change-Id: Ib3cb5d7e7efe8998de446db4d011ed6a3912bc68
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoROADM To ROADM Path Calculation 91/77691/1
Martial COULIBALY [Mon, 12 Nov 2018 15:54:17 +0000 (16:54 +0100)]
ROADM To ROADM Path Calculation

Add to the PCE the ability to calculate the path between two
ROADMs (from/to SRG-PP).

Change-Id: Ia796cb22fc7de0657bc5a09661c1f7aa2fcb6acb
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoReintroduce SP 1.6 models in API module 15/77315/8
Martial COULIBALY [Thu, 13 Sep 2018 15:09:22 +0000 (17:09 +0200)]
Reintroduce SP 1.6 models in API module

Rename all yang modules to be compliant with transportpce-*.yang

JIIRA:TRNSPRTPCE-44
Change-Id: I0018dbbad7a84ab2a185256356813337cc48bc94
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBump to yangtools 2.0.12 91/77491/1
Martial COULIBALY [Mon, 5 Nov 2018 08:49:46 +0000 (09:49 +0100)]
Bump to yangtools 2.0.12

Change-Id: I0214031cc909541f35b08d8453fd02c44a564bf6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBug correction in ServiceDatastore Operations 45/77345/2
Martial COULIBALY [Wed, 3 Oct 2018 09:10:39 +0000 (11:10 +0200)]
Bug correction in ServiceDatastore Operations

* modify mappingServices from ModelMappingUtils to not add container
topology in service datastore because RPC serviceImplementation not
returned this information. Otherwise Renderer module add this Topology
information in datastore.
* remove some bug in renderer ModelMappingUtils

Change-Id: I0280aabd5c9943030a27ec4cd27698413efc3d0d
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBump oldparent to 3.1.4 23/77323/2
Martial COULIBALY [Mon, 29 Oct 2018 15:13:38 +0000 (16:13 +0100)]
Bump oldparent to 3.1.4

Change-Id: I17497a22493ef1e2fee8735ad33927d1d06bc76e
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate OLM function tests 81/77181/1
Gilles Thouenon [Fri, 19 Oct 2018 15:35:33 +0000 (17:35 +0200)]
Update OLM function tests

- tests calculate-spanloss-base rpc with all links
- tests calculate-spanloss-current rpc

Change-Id: I0cf3cba86d92b478b9bf644a0ac222faf12253c9
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoOLM bug correction in rpc span-loss-current 80/77180/1
Gilles Thouenon [Fri, 19 Oct 2018 15:27:45 +0000 (17:27 +0200)]
OLM bug correction in rpc span-loss-current

- remove internal class which defined ROADM links
- bug correction in calculateSpanlossBase and calculateSpanlossCurrent
methods of OlmPowerServiceImpl class
- adapt olm yang model to return the list of roadm links with their
associated spanloss

Change-Id: I4c9477d873aad17791347a803b0d7f67f202ca0e
JIRA: TRNSPRTPCE-47
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoOLM functional Tests init 69/77169/1
Martial COULIBALY [Fri, 5 Oct 2018 14:55:57 +0000 (16:55 +0200)]
OLM functional Tests init

- complement functional test suite with additional checks
  - 'power' value of a roadm-connection
  - different cases according to presence or not of 'power-capabilities'
    in configuration node
- update initializing config files of nodes according to these tests

Change-Id: Ib3dd25ba3d9309023da2b91f76c719b35daa34ae
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoEnhance the createOtsOms RPC with a timer 68/77168/1
Martial COULIBALY [Fri, 5 Oct 2018 14:23:34 +0000 (16:23 +0200)]
Enhance the createOtsOms RPC with a timer

Modify the createOtsOms RPC to be able to wait 1min until the operation
'updatePortmapping' refreshes the supportedOts information in the
portmapping datastore.

Change-Id: I8ebdb52f528a65d8abd1843ead54959f9d65ca79
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoclean some compilation warnings 46/77146/1
guillaume.lambert [Mon, 3 Sep 2018 14:59:53 +0000 (16:59 +0200)]
clean some compilation warnings

- remove HiddenField warnings
- remove HideUtilityClassConstructor warnings
- remove Servicehandler private constructors call from Junit tests
- remove unused imports
- remove WhitespaceAround warnings

Change-Id: Ie71482b476b2b92e91f96df36463315bf935037b
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoBug correction in topoPortMapping tests 45/77145/1
Martial COULIBALY [Wed, 10 Oct 2018 14:27:49 +0000 (16:27 +0200)]
Bug correction in topoPortMapping tests

Change-Id: I7942014db5149258a7718c653a4e80db2b132f49
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate testtool version to release/fluorine 44/77144/1
Martial COULIBALY [Tue, 9 Oct 2018 15:10:41 +0000 (17:10 +0200)]
Update testtool version to release/fluorine

Change-Id: Iad8ba2987c224bac0da0688c3b5a1aea4a0ae602
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoremove stubs bundles from build process 43/77143/1
guillaume.lambert [Mon, 17 Sep 2018 13:10:38 +0000 (15:10 +0200)]
remove stubs bundles from build process

move stubrenderer implementation to servicehandler test folder.

Change-Id: I8a284ea6445421aecbcd99a804274c5f20017e7d
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoremove impl and it useless folders 42/77142/1
guillaume.lambert [Mon, 17 Sep 2018 13:09:56 +0000 (15:09 +0200)]
remove impl and it useless folders

Change-Id: I55618d4d1da2651661c0222f7e2610e8597914a1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agoCorrect tp creation of Xponders in topo layer. 43/76643/4
Dhruv Bhardwaj [Thu, 4 Oct 2018 13:44:03 +0000 (09:44 -0400)]
Correct tp creation of Xponders in topo layer.

JIRA: TRNSPRTPCE-12
Change-Id: I27e891752709eda1e4606feaabba5db1c2eaecf4
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>
5 years agoMerge "Honeynode Enhancements"
Guillaume Lambert [Thu, 18 Oct 2018 13:23:45 +0000 (13:23 +0000)]
Merge "Honeynode Enhancements"

5 years agoMerge "Push service name to interfaces"
Guillaume Lambert [Thu, 18 Oct 2018 12:47:23 +0000 (12:47 +0000)]
Merge "Push service name to interfaces"

5 years agoHoneynode Enhancements 96/76796/1
Martial COULIBALY [Tue, 11 Sep 2018 13:42:41 +0000 (15:42 +0200)]
Honeynode Enhancements

- remove warnings with fluorine controller
- make Honeynode use only one configuration file with all container :
  * netconf streams
  * org-openroadm-device
  * currentPmlist

JIRA:TRNSPRTPCE-38
Change-Id: I167be28214058d4d55d0bf7b49b220edcda8e402
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agodowngrade dependencies to stable/fluorine SR1 94/76794/1
Martial COULIBALY [Tue, 9 Oct 2018 12:24:27 +0000 (14:24 +0200)]
downgrade dependencies to stable/fluorine SR1

Change-Id: I68e9c8cdd1ca52d6e9c1082f34ecb46be2ad7bd6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoPush service name to interfaces 40/76540/6
Dhruv Bhardwaj [Mon, 1 Oct 2018 17:35:46 +0000 (13:35 -0400)]
Push service name to interfaces

JIRA: TRNSPRTPCE-17
Change-Id: If47e38c645ca0c39610874d4674ca8245e489f84
Signed-off-by: Dhruv Bhardwaj <db929a@att.com.com>
5 years agofix Honeynode issues with fluorine 12/75112/14
Martial COULIBALY [Sat, 11 Aug 2018 00:33:12 +0000 (02:33 +0200)]
fix Honeynode issues with fluorine

- solve the OpenEXI compability with honeynode with a patch to
netconf-netty-util module
- solve the rpc 'get-schema' error by putting a netconfState info in the
OPERATIONAL datastore and copying in a dedicated folder all the yang
schemas needed at honeynode start-up (similarly to testtool)
- move device datastore config listener from core module
'minimal-distribution-core' to 'honeynode-plugin-impl' module.

JIRA: TRNSPRTPCE-32
Change-Id: I9af0ec2e098271a18993433cf99db9b3b5f73b20
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoFunctional tests for renderer 50/74650/5
Christophe Betoule [Fri, 1 Jun 2018 17:36:06 +0000 (19:36 +0200)]
Functional tests for renderer

These tests verify the renderer RPC service-path in a nominal usage.
These functional tests run on honeycomb based emulation nodes and verify
interfaces (och, otu, odu, Ethernet) and roadm-connection creation and
deletion on RDM and XPDR configuration datastore.

JIRA: TRNSPRTPCE-10
Change-Id: If05ea55c28289c5d264dde39c0b95c6913df1f88
Co-authored-by: Gilles Thouenon <gilles.thouenon@orange.com>
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
5 years agoUpdate portmapping functional tests 49/74649/5
Gilles Thouenon [Wed, 18 Jul 2018 09:43:03 +0000 (11:43 +0200)]
Update portmapping functional tests

-replace testtool by honeycomb netconf node simulator for this test
suite
-adapt initial node configuration (new SRG for ROADM, different logical
connection point values for XPDR configuration)
-complement XPDR test configuration
-rationalize tox configuration accordingly

JIRA: TRNSPRTPCE-10
JIRA: TRNSPRTPCE-22
Change-Id: I70ccf0f53bf3bad4655888f3c4739be1aa628d99
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoUpdate PortMappingImpl for XPDR node 48/74648/5
Gilles Thouenon [Wed, 18 Jul 2018 10:01:44 +0000 (12:01 +0200)]
Update PortMappingImpl for XPDR node

-Check different possible values for "logical-connection-point" in XPDR
node configuration to be aligned with portmapping functional tests.

JIRA: TRNSPRTPCE-22
Change-Id: Ib66b6d52e9f7a006bce2718207804bf9a746cc02
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
5 years agoMerge "fix netconf testtool portmapping"
Guillaume Lambert [Thu, 13 Sep 2018 13:01:12 +0000 (13:01 +0000)]
Merge "fix netconf testtool portmapping"

5 years agoMerge "Update unit testing - Renderer"
Guillaume Lambert [Thu, 13 Sep 2018 13:00:07 +0000 (13:00 +0000)]
Merge "Update unit testing - Renderer"

5 years agoMerge "fix more javadocs warnings"
Guillaume Lambert [Thu, 13 Sep 2018 12:59:52 +0000 (12:59 +0000)]
Merge "fix more javadocs warnings"

5 years agoFix R2R link deletion problem 60/76060/1
shweta [Mon, 23 Jul 2018 18:06:08 +0000 (14:06 -0400)]
Fix R2R link deletion problem

JIRA: TRNSPRTPCE-4
JIRA: TRNSPRTPCE-13
Signed-off-by: shweta <sv111y@att.com>
Change-Id: Ic48e2aa148b12f51d9380d34f890c96346ab018d

5 years agoMigrate transportpce docs to project repo 90/75890/2
Thanh Ha [Sun, 9 Sep 2018 01:31:20 +0000 (21:31 -0400)]
Migrate transportpce docs to project repo

Issue: DOCS-69
Change-Id: I035abf694de6e5fb23ef3457d6584402c11cafb9
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
5 years agoBootstrap transportpce documentation 89/75889/2
Thanh Ha [Sun, 9 Sep 2018 01:28:02 +0000 (21:28 -0400)]
Bootstrap transportpce documentation

Issue: DOCS-69
Change-Id: Ic3dd2d82ee6af8cdb50a971d1012646dc54f89d1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
5 years agofix more javadocs warnings 93/75793/1
guillaume.lambert [Tue, 4 Sep 2018 13:49:54 +0000 (15:49 +0200)]
fix more javadocs warnings

Change-Id: Ic03ee472e01b7d229759fb2c5fca93c44b7332b2
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
(cherry picked from commit aa5b53b863a5a699d32febadc3345baa4038a653)

5 years agoBump versions by x.(y+1).z for next dev cycle 46/75746/2
Martial COULIBALY [Wed, 5 Sep 2018 07:36:53 +0000 (09:36 +0200)]
Bump versions by x.(y+1).z for next dev cycle

Change-Id: I7ffd75c755ab22eccdbb43a6743d98b7a0cb0a49
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate unit testing - Renderer 35/75235/2
doha.khaled [Wed, 1 Aug 2018 11:50:13 +0000 (13:50 +0200)]
Update unit testing - Renderer

JIRA: TRNSPRTPCE-11
Change-Id: I721603b6733accca1fa1fdaf2c3eb8f3cf0d77f2
Signed-off-by: doha.khaled <dkhaled.ext@orange.com>
5 years agofix netconf testtool portmapping 68/75168/1
Martial COULIBALY [Mon, 13 Aug 2018 13:32:39 +0000 (15:32 +0200)]
fix netconf testtool portmapping

Change-Id: I0a1aa88e3488fd585ea85616210761799ba046ad
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoAdd check in cp state to avoid npe 31/74931/1
Dhruv Bhardwaj [Tue, 7 Aug 2018 19:41:46 +0000 (15:41 -0400)]
Add check in cp state to avoid npe

Change-Id: I27469f5e95e7a20a5110628515ce099e760d1a51

5 years agoRemoved debug statement 30/74930/1
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:40:45 +0000 (14:40 -0400)]
Removed debug statement

Change-Id: Iabb51395f3ef8256da307d63b996d4c4612eead7

5 years agoUpdate xponder portmapping 29/74929/1
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:37:23 +0000 (14:37 -0400)]
Update xponder portmapping

Change-Id: Ib740319fc4b5ee9e6cd3a9b6e275f1321b465ec5

5 years agoMerge "Fix Issues coming up during end to end testing"
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:24:22 +0000 (18:24 +0000)]
Merge "Fix Issues coming up during end to end testing"

5 years agoFix Issues coming up during end to end testing 25/74925/7
shweta [Tue, 7 Aug 2018 17:23:58 +0000 (13:23 -0400)]
Fix Issues coming up during end to end testing

1. Correct NodeId read offset in ModelMapping Utils
2. Correct Portmapping creation for XPDR
3. Remove notification subscription feature
4. Deleted unit test file :
    RendererServiceOperationsImplTest,
    RendererServiceOperationsImplDeleteTest.

Change-Id: Id29187c59dac9b9afa7479e057a60448d3c42bca

5 years agoRemove the inventory feature 42/74742/2
guillaume.lambert [Wed, 1 Aug 2018 14:37:57 +0000 (16:37 +0200)]
Remove the inventory feature

The inventory feature needs to be rethought and also requires an
external DB that will not be shipped in the formal release.

Change-Id: I1eae9a429592151bc1faedb3473f9029b9dfc800
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
5 years agofix functional tests 51/74851/2
Martial COULIBALY [Mon, 6 Aug 2018 12:43:31 +0000 (14:43 +0200)]
fix functional tests

Change-Id: Iad15d5af4b9376bcb734412109a0b0a755d4ecd5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
5 years agoUpdate unit testing - Renderer 54/74654/5
doha.khaled [Wed, 1 Aug 2018 11:50:13 +0000 (13:50 +0200)]
Update unit testing - Renderer

JIRA: TRNSPRTPCE-11
Change-Id: I42f760cdd39ed0a7585965a506ba05070b370529
Signed-off-by: doha.khaled <dkhaled.ext@orange.com>