Bug correction in topoPortMapping tests

Change-Id: I7942014db5149258a7718c653a4e80db2b132f49
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Update testtool version to release/fluorine

Change-Id: Iad8ba2987c224bac0da0688c3b5a1aea4a0ae602
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

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>

remove impl and it useless folders

Change-Id: I55618d4d1da2651661c0222f7e2610e8597914a1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Correct tp creation of Xponders in topo layer.

JIRA: TRNSPRTPCE-12
Change-Id: I27e891752709eda1e4606feaabba5db1c2eaecf4
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>

Merge "Honeynode Enhancements"

Merge "Push service name to interfaces"

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>

downgrade dependencies to stable/fluorine SR1

Change-Id: I68e9c8cdd1ca52d6e9c1082f34ecb46be2ad7bd6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Push service name to interfaces

JIRA: TRNSPRTPCE-17
Change-Id: If47e38c645ca0c39610874d4674ca8245e489f84
Signed-off-by: Dhruv Bhardwaj <db929a@att.com.com>

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>

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>

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>

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>

Merge "fix netconf testtool portmapping"

Merge "Update unit testing - Renderer"

Merge "fix more javadocs warnings"

Fix R2R link deletion problem

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

Migrate transportpce docs to project repo

Issue: DOCS-69
Change-Id: I035abf694de6e5fb23ef3457d6584402c11cafb9
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Bootstrap transportpce documentation

Issue: DOCS-69
Change-Id: Ic3dd2d82ee6af8cdb50a971d1012646dc54f89d1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

fix more javadocs warnings

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

Bump versions by x.(y+1).z for next dev cycle

Change-Id: I7ffd75c755ab22eccdbb43a6743d98b7a0cb0a49
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Update unit testing - Renderer

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

fix netconf testtool portmapping

Change-Id: I0a1aa88e3488fd585ea85616210761799ba046ad
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Add check in cp state to avoid npe

Change-Id: I27469f5e95e7a20a5110628515ce099e760d1a51

Removed debug statement

Change-Id: Iabb51395f3ef8256da307d63b996d4c4612eead7

Update xponder portmapping

Change-Id: Ib740319fc4b5ee9e6cd3a9b6e275f1321b465ec5

Merge "Fix Issues coming up during end to end testing"

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

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>

fix functional tests

Change-Id: Iad15d5af4b9376bcb734412109a0b0a755d4ecd5
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Update unit testing - Renderer

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

Fix circuit-pack equipment state on XPDR

Change the equipment state of circuit-packs supporting ETH and OCH
interfaces of XPDR node to "not-reserved-inuse" after creation and to
"not-reserved-available" after deletion.

JIRA: TRNSPRTPCE-28
Change-Id: Id662d1ef664f8283ca4ae7cd25a7f874351fdd7a
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

Creation of OTS-OMS interfaces

- add new rpc in renderer@2017-02-28.yang
- add 2 methods in OpenRoadmInterfaceFactory.java to create ots and oms
interfaces on ROADM configuration datastore
- add method in PortMappingImpl.java to update the associated mapping
with new interfaces just created
- modify DeviceRendererServiceImplTest.java and
RendererServiceOperationsImplTest.java to take into account blueprint
modification..

Change-Id: I4eb21aed513a5378d23559827bc581dad60412a3
JIIRA: TRNSPRTPCE-8
JIIRA: TRNSPRTPCE-33
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

fix unit test Renderer

JIRA: TRNSPRTPCE-11
Change-Id: Ibf13f1af6ba04755c624ee58e6a5520e14c44adc
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

clean some compilation warnings

mostly remove LineLength warnings introduced in Fluorine bump changes

Change-Id: I1ab4cd671ad7a453abd2c5a158a7590bda7ca1ce
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

update netconf testtool version

- switches testtool mock version from 1.3.1 to 1.5.0-SNAPSHOT
  (netconf dir git submodule switched to branch 'origin/master'):
  testtool 1.3.1 caused some errors with the fluorine controller for
  several reasons including EXI messages generation.
- updates patches, nose tests files and scripts consequently

JIRA: TRNSPRTPCE-32
Change-Id: I27476ea83edefbffff986ddc856078219f925fc6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

remove rfc8345 dependencies

- remove direct dependencies in ordmodels
- remove indirect dependencies inherited from mdsal models in others pom
- repackage correctly ietf-network-* models revision 2015-06-08

JIRA: TRNSPRTPCE-29

Change-Id: Icbf5f9cef59fed6f04c741f2cfb0875f63a82026
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

package ietf-network 2015-06-08 yang models

JIRA: NETCONF-550
JIRA: TSC-124
JIRA: TRNSPRTPCE-29

Change-Id: I416422e94a8f684b1246efa21cddb424d2136c11
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Upgrade to Fluorine dependencies

This switches all the ODL dependencies to the appropriate versions for
Fluorine.

Note that due to the rfc8345 ietf-network migration, openroadm imports
of 2015-06-08 ietf-network-* models are no more available so this fails
to build until those obsolete draft models are repackaged inside tpce.
https://git.opendaylight.org/gerrit/#/c/73591/

JIRA: NETCONF-550
JIRA: TSC-124
JIRA: TRNSPRTPCE-29

Change-Id: I288e560cc9eb376facc61c34a098b3fba5f524d8
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Remove Karaf4 useless features

Change-Id: I02496ac1574d2094eb937fa995cad251ec94cafc
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

fix some compilation warnings

Change-Id: I73d5b4906d85cfc2ab6e2457335192e8a8d19ce7
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Initial unit testing commit - Renderer

JIRA: TRNSPRTPCE-11
Change-Id: Iae7f1d5d4e4b8d9ba3227b5debcc30437220d460

fix functional tests suite

- fix ServiceHandler Stub patch file
- fix the tox.ini configuration file so that the complete test suite can
  be performed
- comment out the portmapping and servicehandler tests 01 since there is
  no more netconf node "controller-config" automatically connected

Change-Id: I044063b6adc06a42d58101d66cc8712b44ec55b4
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

RPC to delete link

Implemented RPC to delete link with a given link-id

JIRA: TRNSPRTPCE-16

Change-Id: I722002997250d4dd07a2f9195f4828eecc7dcfee

Manage service deletion on XPDR node

-Manage the case where XPDR ports (client, line) are unidirectionals.
-Test if an OCH interface is not used by another cross-connection
(in the reverse side) before deleting it (new isUsedByXc() method).

Change-Id: Icceef760c21626c96ea1c48b417fd2332372da47
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>

ServiceHandler unit testing update

The Complete unit testing for the ServiceHandler module

Change-Id: Ica4bbba4e94bd46c8c44d965071fe0409abd4637

Service Handler unit test update

-serviceReroute
-PCEServiceWrapper

Change-Id: I0f77e47d1b246c9349c15c50b9a0187d099053dd

Test alignment between topology and portmapping

- connect one ROADM and one XPDR
- check the alignment of the TPs naming between both the topology
and what appears in the port mapping
- test 5 fails because naming of TP  are not aligned for the XPDR

JIIRA: TRNSPRTPCE-5
Change-Id: I514f2cae964c8cb12e2bb8700a19d946f4059b72
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>

Topology functional tests bugs correction

- modify the code to ignore the order of appearance of nodes or links
in the REST query responses
- tests 24, 25, 33 and 37 have been commented out. They fail because of
  current mocks limitations.
- add the karaf launch option "server"

JIRA: TRNSPRTPCE-4
JIRA: TRNSPRTPCE-13
Change-Id: I7662255acbfd1a2fe075a7397f23e606a4252d92
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>

Functional tests for the topology init

- connects successively ROADMA, XPDRA ROADMB and ROADMC and then
disconnect them
- checks that the clli-network, the openroadm-network and the
openroadm-topology are well updated and the appropriate links/nodes
are well created/deleted after each creation/deletion operation
- checks that a degree is not used by more than one link at the same
time
- tests 9 and 17 currently fail beause 4 TPs appear (XPDR1-CLIENT1,
XPDR1-NETWORK1, XPDR1-CLIENT2 and XPDR1-NETWORK2) while only 2 TPs are
defined in the sample-config-XPDRA.xml
- tests 24, 33 and 37 currently fail because the link ROADM-to-ROADM
is not automatically deleted.
A new version of the code will be proposed by ATT where these links will
be marked as up or down:
    Up to indicate the pce that the path is available for service
    Down to indicate that the path is not available

JIRA: TRNSPRTPCE-4
Change-Id: Iba78869ad884fadd766f11c4c321ae1b4bdfcd64
Signed-off-by: Ahmed Triki <ahmed.triki@orange.com>

fix karaf launch error from tox

Add a karaf launch option 'server' in python nose files.
This option disables the karaf local console.
(OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true")

Change-Id: Iac160454fa6a74aa31813dacbb74a94dce417592
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

fix some karaf runtime errors

remove the following errors :
- netconf-monitoring already start error
- netconf-impl completion error cause by netconf-console
the netconf CLI is still broken at startup but works again after one
Netconf device has been connected (through the REST API)

JIRA: NETCONF-534
JIRA: TRNSPRTPCE-6
Change-Id: Idec350c7679891098bd8b94448292468a787fa1c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Increase OLM timer to turn-up xc power in RDM node

Increase a timer from 20s to 60s when the RDM node is in a "power" state
to let it configure the optical power level of a cross-connection before
moving to "gainLoss" state.
NB: The value recommended in the openroadm whitepaper is normally 20s.

Change-Id: Ife8153f11977844f2b074d118e1dcfe93858eb79
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

Bug corrections in ServiceHandler

- Change CONFIGURATION datastore to OPERATIONAL which is the right
LogicalDatastoreType to look into to get services already created.
- Fix the bug mappingServices method in ModelMappingUtils class.

Change-Id: I23a0871e0f1d50180c3b09f185693888e2a83840
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Co-authored-by: Doha Khaled <dkhaled.ext@orange.com>

Functional Tests for servicehandler

These tests verify the servicehandler RPCs service-create and
service-delete.
Some tests have been (temporarily) disabled because a few RPCs are no
more available following the ServicePath downgrade from 1.6 to 1.5 :
cf change 72037 'ServiceHandler update for new PCE compatibility'

Change-Id: Ib57a35aef9cd89fc7b3e26bbd43d6a5195e5d533
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

ServiceHandler unit tests init

Change-Id: I4cd1989fea6971e7d06874978fe05d33407c0f78
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: doha.khaled <dkhaled.ext@orange.com>

ServiceHandler update for new PCE compatibility

- Updates to have org-openroadm-service.yang
- Creates new mapping utils
- Implements service-create, service-reroute and service-delete RPCs
- Integrates the Service handler with PCE, Renderer, OLM and network
topology manager
This commit downgrades the Service Handler functions to the servicepath
1.5 YANG specifications so that they match with the PCE current RPCs.
This implies that some RPCs already implemented in servicepath 1.6
(service-reconfigure,service-restoration) will no more be available,
at least until the PCE is upgraded.

Change-Id: I94f2edbcfbde22747871e7eec55ed01e198e40af
Signed-off-by: Shweta <sv111y@att.com>
Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

fix karaf runtime log console

JIRA: TRNSPRTPCE-6
Change-Id: I6f7b46c77f54742a02de2b8200d04e3592f34bea
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

fix some compilation warnings

Change-Id: I007c87de212afbc58ad91965eeefa3649066c375
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

PCE module init

- Minimim hop based path calculation using network model
- Weighted path calculation based on propagation delay
- Checks available wavelength
- Supports hard constraints based routing with latency
- Provides JUnit tests
- Adds a pce functionnal test  (python script 'tests_pce.py')
- Creates for it a specific profile called 'pce' in the tox.ini file.
  PCE functionnal tests can be launched from the tests folder with
  the command 'tox -e pce'

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I7be504ec423e240baaeaa731d50424be46df82ea
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

fix build configuration and dependencies

repair project build by correcting dependencies import

Change-Id: Id4c6beb550d81a6f00dd76315801b411b4c1bd23
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

creates common test functions

adds a test-common folder at project root that contains several
functions to convert XML to DataObjectConverter and vice versa

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: Ie7fbe4db4678843bc89e67a2269a5587e722ef75
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

clean some XML files

removes tabs and trailing blanks from various XML files and configs

Change-Id: I903f94d66b639514947cac671628f0a54a42db47
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Bug corrections in topo and portmapping modules

- insert if not found, the SRG number into the logical connection
point name during the portmapping creation.
- add the CP as one of the  termination points of the SRG
- put the right node type value of the XPONDER
- take into account the ROADMs found by the lldp even if the previous
declared ones are missing

Change-Id: I9da179dada5a23c764da3fdb3f74ccd493e9dc4e
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Relicensing a few files from EPL to Apache License

Honeynode resused some files under EPL that come from a previous
testtool development. This commit relicenses those files.
FD.io honeycomb project uses the Apache License contrary to ODL.
EPL headers in honeynode generated checkstyle errors during build phase.

Change-Id: I76b02475146866e3c44802274069bdcc680c931f
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Honeynode test tool

- Add honeynode folder in tests module.
- Add some operational config files.
- Add README file.

Honeynode is base on FD.io project https://fd.io/.
Due to checkstyle warnings cause by FD.io licence
you have to compile this projects with:
mvn clean install -DskipTests=true -Dcheckstyle.skip

Change-Id: I43b94db04f27c2e93b096aa4c7488dc51ca104a2
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Bugs correction in NetworkModelService

Modify NetworkModelService class to add deleteOpenROADMnode function
to be able to :
- delete OpenROADM node portmapping
- delete OpenROADM node topologies (clli-network, openroadm-network,
openroadm-topology) created in datastores.
Modify NetConfTopologyListener OnDataTreeChanged to allow Portmapping
working in Oxygen. This issue is similar to the previous commit
"Bug correction in RendererNotificationImpl"

JIRA: TRNSPRTPCE-18
Change-Id: Ib529aff433c14c1c103f39be158b2a7746cb0cef
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Network topology and inventory init

- Includes network topology creation when NE gets mounted including
CLLI, Openroadm-Network and Openroadm-Topology
- Abstracts network model for Roadm and Xponder nodes
- Derives Roadm-to-Roadm links from LLDP config and notifications
- Provides RPC to create Xponder-input and Xponder-output links
- Includes functionality to update available and used pool based
on service-create and service-delete request
- Remove log error for LLDP subtree
Differences with initial change from ATT-Sandbox branch
- Fix code design issues pointed by Juraj (Patch Set 5)
https://git.opendaylight.org/gerrit/#/c/68859/5
- fix inventory feature building

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I440caf77157d2fa5a5b17ab048252c96833e7561
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Minor checkstyle corrections

Change-Id: Ie9f5ba977615211e5813cc47d39fb7f363d961e1
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

activate deleteMapping function in Renderer

the deleteMapping data function was added in a previous commit
dcc4c10093436dbb7692c50c210daf86fd5b124a

more details in Gerrit change 74091
https://git.opendaylight.org/gerrit/#/c/74091/

Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I5392512a0b3323178aef6275de0d938cdb74a7e3
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Renderer and OLM update

- Supports multiple threads configuring devices simulatneously rather
than sequentially earlier.
- It is now updating service-list topology with port-trail details.
- Performs service activation test by checking pre-FEC BER values at
a-end and z-end transponders and compares it to a threshold.
- Rollback:
    - Rollback based on device provision failure
    - Rollback based on powerset failure
    - Rollback based on ber test failure
- Alarm management:
    - Alarm parsing and logging for fault detection
    - Alarm suppression at the time of service-request
    - Alarm inventory
- Simultaneous power control on A-Z and Z-A direction
- New RPC for calculating span loss base and current based on
network model.

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I7292e82bfecb5fe9c025f9fde8bcd5ebc3be90ba
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Update testtool version in tests folder

- testtool 1.3.1-SNAPSHOT is no more available in netconf nexus repo.
  Switched netconf submodule to branch 'release/nitrogen-sr1' (=1.3.1).
- updated portmapping tests and start.sh with testtool new version.
- changed portmapping tests restconf address 172.0.0.1 into localhost
  because of some tox issues.

Change-Id: Ie885f71c8103800a7888bd456170ceb98e2424df
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

rewrite portmapping functional test

- add support for xpdr devices
- add some tests to check the devices are correctly (dis)connected
- remove useless tests
- add a folder and a subfolder for ordm 1.2.1 sample configuration files
- update the sample ROADM configuration file for tests purpose
  Add new data to create a SRG3 but no SRG2. This is to ensure that
  portmapping parses correctly config with unordered SRGs.
  The related test is "test_07_rdm_portmapping_SRG3_PP1_TXRX".
- add a specific tox profile to allow running portmapping tests only
- add a folder with ordm 1.2.1 models needed by testtool
- update schemas location in build.sh
  New 2.x schemas previously pushed in ordmodels generate errors in
  testool with current ordm 1.2.1 sample configs.
  Although, tests must show that an ODL instance compiled with 2.x
  models can manage ordm 1.2.1 devices.

Change-Id: I67ed29d00cf5cd75e7a9ff854ab598522fc1b83f
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

Bug correction in LogicalConnectionPoint naming

insert if not found, the SRG number into the logical connection point
name during the portmapping creation.

Change-Id: I979dac8100a17c122cf73f2e77403a4df19a03db
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

Pathdescription Update

Modify 'transportpce-pathdescription@2017-04-26' yang file, more
precisely grouping PCE-resource to add container identifiers for
termination-point, link and node.
This modification was made in ATT-SandBox commit 'Renderer and OLM
update' https://git.opendaylight.org/gerrit/66651 and involves stubpce
java code to be modified.

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: Iee8e334d01661cee1fdc792273862b4e5f97075e
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Shweta <sv111y@att.com>

Remove javadoc warnings

Remove javadoc warnings from common and servicehandler projects.

Change-Id: I50c81fb1705b3b9ec4e9c81e8d84c8e1a478447c
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

update project build configuration

updates various  pom.xml files and also the features and karaf folders.

Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I6f32b76df1c330bc383c14ccef6c4ab12c2bd1ee
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Bug correction in RendererNotificationImpl

JIRA : TRNSPRTPCE-18

Change-Id: I9d608b400945ee29cf1dab74af7b1cd926f9de15
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

improve RendererNotificationImpl logs syntax

Change-Id: I1537a0779baaff87b7229b0ca0bc0d16d3b7565f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

skip tests on umbrella and utils projects pom

Change-Id: I2b8d6051dcfe8f1c5aad416389aed2cc03d65045
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

fix javadocs build errors

Change-Id: I2b3dc5e496fc853f4bfdca948a1acd96fb288afd
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Bugs correction in Portmapping

- Modify iteration for getting circuitpacks with srg number.
- Modify OpenRoadmInterfaces constants.
- Modify Portmapping class to add deleteMapping data function. This
function was already in Renderer maven project on master branch, but
was deleted in common maven project on change ATT-Sandbox 'Renderer and
OLM update' https://git.opendaylight.org/gerrit/#/c/66651/.

Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Change-Id: If5833b306d00a6c140da665d2e8c69a2a7c69ac4
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

add a common folder for mutualized functions

Co-Authored-By: Dhruv Bhardwaj <db929a@att.com>
Co-Authored-By: Shweta Vachhani <sv111y@att.com>
Co-Authored-By: Masha Dorfman <>
Co-Authored-By: Archana Soundararajan <as7463@att.com>
Co-Authored-By: Juraj Veverka <Juraj.Veverka@pantheon.tech>
Co-Authored-By: Samuel Kontri <samuel.kontris@pantheon.sk>
Co-Authored-By: Andrej Zan <andrej.zan@pantheon.sk>
Co-Authored-By: Milan Fratrik <>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I1b41bb54a2e5ba05797b67a629c72a38d31d1819
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Openroadm models update

Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I8550bf98c95a59bb3ecde89ad14aaddf98c1bcd1
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

API yang models update

Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Change-Id: I98eaec5ea56a86f1ff5d32189ee44738a111749f
Signed-off-by: Shweta <sv111y@att.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Remove useless folders

- remove useless folders 'impl', 'it' and 'src' folders.
This folders were initially created at project root by maven archetype
and they are now useless here.
- remove useless folder cli and feature transportpce-cli.
Transportpce will not provide a CLI interface.

Change-Id: I09129100ca933cc1f7293c8b9c3cefa1506b374e
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Olivier RENAIS <olivier.renais@orange.com>

Servicehandler Tests

this commit includes :
- Add rpc-state-modify on servicehandler.yang to test
rpc-service-restoration which can only be launch on service with
operational state 'outOfService'.
- Move stubpce.yang and stubrenderer.yang to stubmodels maven project
under tests folder.
- Create specific profile for servicehandler tests in tox.ini file.
So now to only launch servihandler tests you have to use this
command : 'tox -e servicehandler' in tests folder.
- Use parameterized loggins.
- Add 5 more tests to 'tests_servicehandler' python file.
- Mofify some errors on service-create rpc implementaion.
- Add python file 'tests_servichandler.py' to test servicehandler
functions.
- Modifiy stubpce and stubrenderer yang model to add RPCs from
servicepath version 1.5. This modification came from having two version
of servicepath (1.5 and 1.6) in the model directory does not allow me
to access some RPCs. For example trying to get service path list for
1.5 version failed caused the url is the same :
http://localhost:8181/restconf/operational/transportpce-servicepath:service-path-list
So REST API seems to use the last version which is 1.6.

Change-Id: Ief8aab19750fe2959407b90772df8a8a6280e73d
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Olivier RENAIS <olivier.renais@orange.com>

Bump to odlparent-3.1.0 oxygen SR2 snapshot

put dependencies modules into stable/oxygen SR2 x.y.(3-SNAPSHOT)

Change-Id: I4fbf2f792a673d53b22cd9da7ad5658833c992d4
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Bump test dependencies to stable/nitrogen

Change-Id: I6c071cc8abd5658740dadd3dd74b5045230795b0
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>

Bump yangtools dependencies to 2.0.5 stable/oxygen

Change-Id: I24c3ca1b356d6872481ce74777d7a5aba0a7ee16
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Bump to odlparent 3.1.1 stable release

put dependencies modules into stable/oxygen

Change-Id: I2bcb22485335094fc1ed09718be32881db09cd45
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Bump to odlparent-3.1.0

put dependencies modules into stable/nitrogen SR1 x.y.(2-SNAPSHOT)

Change-Id: I806cbd0f283ca0073e6725d600012eb71e23bb95
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

Bump to yangtools-2.0.0 and odlparent-3.0.2

Change-Id: I613dd68d160bfb1e3881f0d760b3a915839517bc
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Olivier RENAIS <olivier.renais@orange.com>

Stubpce Update

(FakePCE implementation) This implementation is only for test purposes and allows
to load PCE topology from xml file.

This commit includes :
- Add java package 'org.opendaylight.transportpce.stubpce.topology'
which implements java classes for getting topology elements from xml
file and build path descriptions List.
- This file 'fakepce.xml' must be in src/main/resources to be loaded
in target/classes and must also follow 'SuperNode'
model (cf fakepce.xml).
- change 'leaf node-id' in case termination-point
in model yang transportpce-pathDescription by 'leaf tp-node-id'
to not interfere with 'leaf node-id' in case node.
- Add PathDescriptionList in stubpce yang model to stored
all possible paths in datastore.
- update servicehandler dependency
- move stubpce and stubrenderer to tests folder
- add dependency 'Version update to 1.6 of the service-path model'.

Change-Id: I29391cc098706c261d109f8f1860bbfd78012c69
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Olivier RENAIS <olivier.renais@orange.com>
(cherry picked from commit 730925ab6a616aef3cc2f5b8b190774fa5708407)

Stubrenderer Update

this commit includes :
- stubrenderer.yang removed
- stubrenderer will now gets his RPCs from
transportpce-service-path.yang.
- solving the following javadoc warning
'IllegalCatch : Catching "Exception" is not allowed'.
- update servicehandler dependency
- move stubpce and stubrenderer to tests folder
- add dependency 'Version update to 1.6 of
the service-path model'.

Change-Id: I3fe58dae7e613517312de69a13877dd16bf4f4e4
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Olivier RENAIS <olivier.renais@orange.com>
(cherry picked from commit 54d80c088d157e5f02ccad86eedcca477ef0e8a8)

ServiceHandler Update

this commit includes :
- Debugging error process failure due to function writeOrDelete.
- solving the following javadoc warning
'IllegalCatch : Catching "Exception" is not allowed'.
- Modifiy all RPCs to wait for stubpce and stubrenderer
notification success or failure before launching other actions.
- Correct major errors on RPC serviceReconfigure.
- Correct all CDP errors from serviceHandler and Stubpce maven project.
- Modfify servicehandler.yang to only have modified notification with
and RPC use rpc-response-status-ex from
org-openroadm-common-service-path-types. ServiceHandler will now get
his RPCs from org-openroadm-service.yang.
- useless blank removed
- correct javadoc warnnings
- move stubpce and stubrenderer to tests folder
- add dependency 'Version update to 1.6 of the service-path model'.

Change-Id: Icb580c1446f55734cbf56139386d9bd9c8a29ae3
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Olivier RENAIS <olivier.renais@orange.com>

Merge "Version update to 1.6 of the service-path model"

Merge "Update Testtools to Nitrogen"

Merge "improves services activation in the renderer"