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"

Update Testtools to Nitrogen

Change-Id: I711495d7b67e8cc7867cbb85863d47f8a638b3b2
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>

Version update to 1.6 of the service-path model

RPCs originally in service-path are now split in several modules which
expose them.
- Replacement of node-id by tp-node-id in path-description/resource to
avoid potential conflicts in the service handler code.
- Move previous and new service path yang models to the 'service_path'
folder.
- Rename transportpce yang models with their revision date.
- Add old revision statement to service_path_v1.6 yang files.
- Modifiy prefix import for transportpce-routing-constraints to be
'transportpce-routing-constraints' and not 'org-openroadm-routing
-constraints' in yang 'transportpce-common-service-path-types
@2017-10-16.yang'.
- Add revision-date statement to import.
- Add missing 'leaf status-message' in grouping rpc-response-status-ex
in 'transportpce-common-service-path-types@2017-10-16.yang'.
- Move stubpce and stubrenderer to tests folder.
- Add missing grouping 'stubpce-path-description' and container
'path-description-list' to transportpce-pce.yang model.

Change-Id: I06667dabb39490c378dfbbf4462c262e078a7f9d
Signed-off-by: Olivier <olivier.renais@orange.com>

Merge "Bug correction to manage unordered SRGs"

improves services activation in the renderer

Adds the new method 'activateService' in DeviceRenderer.java
This method changes the equipment state on circuit-packs supporting the
service terminations points (XPDR device) during a service path creation
and/or removal.
Rewrites all LOG messages according to Best Practices at the URL below.
https://wiki.opendaylight.org/view/BestPractices/Logging_Best_Practices#Use_parameterized_logging

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

Wrong Tp designation in DeviceRenderer.java

A bug was introduced with ch. 64616 and XPDR portmapping improvements.
Termination points were incorrectly named in some checks.
This change corrects the problem.

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

Bug correction to manage unordered SRGs

Srg-numbers were parsed by an incremental loop. In case of discontinuity
in the numbering of the SRG, the last ones were not taken into account.
This change solves this issue.

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

Update PortMapping for XPDR netconf devices

Add some logs in the PortMapping treatment and deal with the case
where a XPDR includes at least one circuit-pack that does not support
even one port.

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

Manage disconnection of a Netconf device from ODL

Updates PortMapping to manage the case when a netconf device is
disconnected from Karaf.
Corrects a bug in RendererNotificationsImpl. During the transient
state of node deletion, the nnode value becomes null. So the
disconnection treatment inside the condition nnode!=null was never
executed.

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

Manage the modulation format of the Och interface

It takes into account the modulation format filled in
the service create Rpc used for the creation of the Och interface
during the createLineInterfaces process

It also updates config-parent version

Change-Id: Id3966a1690ed45c17c8faf1187dac00d2f501b74
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>

Update all pom.xml to be aligned with Oxygen

Change-Id: Iacb7bb349787370d5845e748ae233f315c62d548
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>

adds a folder with some debug tools

This commit includes:
- a simple perl netconf client terminal for testing RPCs.
 It eases the hello handshake and can load custom capabilities from an
 external xml file.
- a perl TCP SSH netconf hijacking proxy for debug purposes.
 It allows to unencrypt and log netconf messages/exchanges between the
 contoller and managed netconf devices.
 Exchanges between both ends (eg. capabilities) are altered according to
 the modifiable rules specified inside the script. This can be useful to
 debug netconf devices and make them work with ODL when they do not send
 the required parameters expected by the controller.
 An option allows to disable this default behavior and turn this script
 into a simple netconf TCP SSH proxy.

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

Merge "minor improvements / corrections in unit tests"

minor improvements / corrections in unit tests

- clarifies dependencies licenses in pip requirements.txt files
- adds in portmapping unit tests
   a copyright / license header
   a classs variable for the controller restconf URL

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

Increase timers

At first it was testing on a very decent machine.
Then it is better to increase the timers.

Change-Id: I98c0e456cec8efeb8ab192dc150e4cab2bf2fb9d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Skip generating javadocs when testing

Change-Id: I9364aea21d325a09b91f50fd5597b6bb56f8c137
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Order unit tests

Change-Id: Iedeab940c838962eb93d5d340e84ddb36e0786cf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Stop using karaf zip

It's now useless as tox builds the transportpce distributions.

Change-Id: I228d0502ed7b42eafd67c0ae39b167d28e7a3b7a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Test renderer:operation": "delete"

Change-Id: I3eac58c093e8535caba4addb3f55245ad964e16d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Set bash as whitelist_external

Change-Id: I3c9b2570c9a4de52b9a88f1d38e929df31b63390
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Stop freezing terminal when stopping ODL

Change-Id: I9bfe3d5ee33efefb1e1710c84aeaa86ccfec8d3d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Complete tox commands

It also compiles ODL, modifies testtools before compiling it.

Change-Id: Ibb2514577bfefa1f44958379d77f374561694a16
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Add UTs for operations/renderer:service-path

It also adds a mock for get-connection-port-trail rpc.
The rpc reply is partial as only one Element can be returned.

Change-Id: I3fa6fe8fd8ca66c95583d79ab4d52fdbb9f3e549
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Allow running unit tests via tox

It eases publishing results in Jenkins.

Change-Id: Iac0295ac359ff1e53a4639bcf4fc742b99d72dff
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Split portmapping testing into dedicated unit tests

Change-Id: I24fc1ef86d4b1b210a97f365278abe10ad8706d9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

First integration tests for portmapping

Change-Id: I4d57d8f81dc1db8c35c197681eb4c2e670d26665
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Publish sample configs for future IT

Change-Id: I542a8dd3f61e2ea5a149929eb65ea5d0cb589382
Signed-off-by: Olivier <olivier.renais@orange.com>

Protect renderer vs cp.getPorts() == null

Otherwise it raises NullPointerException later in the process.

Change-Id: Icc662493b3239cecf790400f25b5970a570e9f8b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Merge "makes renderer ignore controller-config"

makes renderer ignore controller-config

The ODL controller exposes a northbound netconf connector automatically
loaded at karaf start-up under the node-id 'controller-config'.
This connector advertises supported (openroadm) southbound capabilities
but, strictly spoken, it is not an openroadm device.
The renderer should not interact with it.

Change-Id: I366065360b9ba0d90073a9f8739a749eb78315da
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Merge "Bypass testtool issues in NETCONF get rpc"

Bypass testtool issues in NETCONF get rpc

It simply proposes a patch to modify testtools [1].
start.sh is updated to apply it.

[1] https://lists.opendaylight.org/pipermail/netconf-dev/2015-December/000195.html

Change-Id: I06ba0058ded7d0b5aaa97b7696735b23b436c861
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Applies some changes proposed by Sonar

Change-Id: Ia4f30a6be60b1cd87103e0330b82913d8945259b
Signed-off-by: Archana <as7463@att.com>

Merge "Corrects various javadoc problems"

Corrects various javadoc problems

- reactivates javadoc comments in servicehandler.
- fills some missing parameters in existing javadoc comments.
- removes jenkins-releng javadoc useless warnings on api and ordmodels
  generated-sources.

Change-Id: I4fab420479a5c3031c3186158378bef46c6423f6
Co-authored-by: Ahmed Triki <ahmed.triki@orange.com>
Co-authored-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Merge "Sync model with Open ROADM Service"

Merge "Updates to Renderer"

Sync model with Open ROADM Service

It adds org-openroadm-service.yang, renames
org-openroadm-routing-constraints.yang and removes local
modifications.

Change-Id: I3d9658027b7c672924574429c33e0a67d02716cb
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Updates to Renderer

Added code for following interface creation on XPDR
1. Ethernet
2. OCH
3. OTU
4. ODU
5. updated LOGs in OpenRoadmInterfaces.java with nodeId.

Change-Id: Ia41d83347d2bff1d2352a37a3f1d2eb73c02f3f6
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>

Add submodules and scripts to run netconf-testtool

Change-Id: Idb44b8da8caa2b927c0f82e021b8b589e5d677a5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Protect vs bad requests to non Open ROADM devices

Getting Open ROADM device info raises NullPointerException if the
device is not compatible. It should be completed by testing the
capabilities before processing.

It also fixes wrong LOG levels.

Change-Id: Ic5f55904ad347eafc99c9b6b90a7b2a1155268ba
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Keep only Open ROARM models in ordmodels

All other yang files are moved into api.
It may allow using git submodules or git subtree to get ordmodels.

Change-Id: Ib887868bd7213a3e02bbe58a1531f8d1b05ae6f1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Fix typo in portmapping.yang

It also converts it to unix format.

Change-Id: I6d14f0dd3d0fae721573938f2258741d82c68a01
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Sync model with Open ROADM

It only modifies org-openroadm-tca.yang

Change-Id: I99a938bcf4f85cfae0e719395904de73c52c8b93
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Ignore ordmodels/src/main/java

Change-Id: If902f0fa75ab216b551930893f9aaaf2ac419524
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

Bump odlparent version to 2.0.4

Track latest upstream, fixes some bundle refreshes.

Change-Id: I393bee20dddd22d744124f679d4d0cee3a58ee6b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

Power control commit for OLM

It includes implementation of 2 functionalities:
1. Turning up a wave-length: It includes calculating power requirement,
Updating target-output-power and setting power mode for Roadm and
Transponder
2. Turning down a wave-length: It sets interface state to out of status
and updates powers levels

Change-Id: Ie42b6db766d76e13a5ed8763ec263d8d947d47c7
Signed-off-by: Shweta Vachhani <sv111y@att.com>

revision format correction in  api yang models

added a 0 in the month revision of olm.yang portmapping.yang renderer.yang

Change-Id: I6738d7e782eb25c7b72b27e111298d7b2ebd14dc
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>

Karaf 4 Migration

1. The parent of karaf project is changed from karaf-plugin
   to karaf4-plugin.
2. odl-parent aligned to 2.0.2
3. Reorganized features folder according to migration guide
   ( one folder for each feature )
4. Fixed dependencies
   - feature-* dependency migrated to feature4-*
   - dependency removed from features/pom.xml file
5. Fixed test phase by commenting problematic dependencies
6. Corrected the parent of features-tranportpce from features-parent to
single-feature-parent according to
http://docs.opendaylight.org/en/stable-carbon/
developer-guide/odl-parent-developer-guide.html

Change-Id: I7f5fd0caa66d0609f8f1792d46be961ee458c062
Signed-off-by: Shikun Li <jacketshikun@gmail.com>
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

pom and features version upgrade (odlparent 1.9.0)

1. Updating version by x.y+1.z for next dev cycle
2. Removed xsql feature from features.xml currently not being used.

https://lists.opendaylight.org/pipermail/odlparent-dev/2017-June/001089.html

Change-Id: I82b996016e57e0b3e60f61cab37a0ed2e433670f
Signed-off-by: Dhruv Bhardwaj <db929a@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

Initial commit for ServiceHandler

- Add Servicehandler folder to project
- Add Stubpce & Stubrender folder to project
- Add RPCs implementation :
* serviceCreate
* serviceDelete
* serviceFeasabilityCheck
* serviceReconfigure
* serviceRestoration

Change-Id: I98c887222ab57d15a41aecf1097b1ee5c894c251
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Signed-off-by: Xavier POUGNARD <xavier.pougnard@orange.com>

Initial commit for OLM

It includes implementation of 2 functionalities:
1. PM retrieval by nodeId, resource type, resource Id and granuality.
   This RPC simplifies PM reading which can be used for BER test or
   PM monitoring service
2. Spanloss calculation for links and update spanloss in device's
   OTS interface subtree.

Change-Id: I1f8a16a5ba776eb420003b8e153681ff484edbe9
Signed-off-by: shweta <sv111y@att.com>