Gilles Thouenon [Tue, 8 Jan 2019 11:14:57 +0000 (12:14 +0100)]
Manage opposite link in topology in unidir context
- add opposite link augmentation at the link creation in openroadm
topology only when the link is terminated on bidirectional tp. This
forces pce to calculate ZtoA path in a unidirectional topology context
(instead of 'reversing' AtoZ path)
- change the port sorting in portmapping/topo.
Change-Id: I998d4cb57391ac001d13024f7ece2ffa5cb47eb7
JIRA: TRNSPRTPCE-70
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Martial COULIBALY [Wed, 26 Dec 2018 15:21:36 +0000 (16:21 +0100)]
PCE Calculation on UNIDIR port
- force PCE to calculate ZToA path on unidir ports.
- solve PCE calculation error with SRG-CP Bidirectionel with
SRG-PP unidir.
- solve NullPointerException cause by getting oppositeLink
for UNIDIR link, not present in topology.
JIRA: TRNSPRTPCE-70
Change-Id: I728cc081c7a40838349eef6481f82b6bf1349029
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Gilles Thouenon [Mon, 24 Dec 2018 09:26:40 +0000 (10:26 +0100)]
Add port-direction in mapping of xpdr network port
-information required by pce to calculate reverse path in case of
unidirectional port configuration.
Change-Id: Id27f563f6a8efb635f7e8a9e61038bf76957f86c
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
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>
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
- Tests 15-18,22-23,36-40,47-48 may fail because of the current
non-deterministic way to select network port of XPDR device when
several ports are available.
Change-Id: I725e9021f3a6e8da768218de60882079c4c9ef6e
JIRA: TRNSPRTPCE-54
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Tue, 27 Nov 2018 18:09:01 +0000 (19:09 +0100)]
Clean-up code of portmapping-topology refactoring
- delete numbers of methods no longer usefull after portmapping and
topology consolidation (notably in PortMappingImpl, OpenRoadmTopolgy...)
Change-Id: I077cfd5a03e6eac0fda3fd2eaf706e313fce38bd
JIRA: TRNSPRTPCE-34
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Gilles Thouenon [Mon, 26 Nov 2018 17:28:35 +0000 (18:28 +0100)]
Reintegrate ROADMtoROADM links in Topology
- reintegrate readLLDP to automatically discover ROADMtoROADM links in
the topology-portmapping consolidation
- augment NodeData and TopologyShard objects to introduce corresponding
CpToDegree data
- adapt createDegreeNode method to add this information
Change-Id: Ib71f82ffacb44c60e9da3203d97835afd559fcf5
JIRA: TRNSPRTPCE-34
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Gilles Thouenon [Fri, 23 Nov 2018 16:59:20 +0000 (17:59 +0100)]
PortMapping and Topology consolidation for XPDRs
- use connection-map of xdpr operational data to associate
client-to-network ports (manages only the case of point2point connection
map connectivity, not point2multipoint)
- create 'createXpdrNode' method to add xpdr node in topology and
create its associated portmapping
- portmapping functional tests 11,13 and 14 are currently failing and
must be reviewed
Change-Id: I90c8c9bdda9b7c05d6896f73f4faf9a7189e4621
JIRA: TRNSPRTPCE-34
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Gilles Thouenon [Fri, 23 Nov 2018 10:28:14 +0000 (11:28 +0100)]
PortMapping and Topology consolidation for ROADMs
- introduce DeviceConfig interface to mutualize device configuration
analysis between topology and portmapping
- most of private methods of PortMapping are no longer usable (mutalized
with topology)
- change NodeData object to introduce corresponding portmapping
- manage TxRx port direction directly from device configuration
- change the way to manage CP and CTP logical connection points (always
TxRx to simplify link creation)
- link creation in ROADM are attached to TP created for each srg and
degree nodes
- opposite link for ROADM refers to the id of a real link created just
before
- introduce the SortByName utilitary class to sort PortName of
circuit-packs during topo/portmapping TP/LCP creation
Change-Id: I62eb49400761b87835f523ec94c109dce4fa212d
JIRA: TRNSPRTPCE-34
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
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>
(cherry picked from commit
763137f0af119b68664ec1309f06915c74747f14)
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>
(cherry picked from commit
9bb763c7e4481c410db29c9b08d05b7206597130)
guillaume.lambert [Tue, 4 Dec 2018 09:35:36 +0000 (10:35 +0100)]
fix javadoc warnings
Change-Id: I32ded60289b62f3620f8d08dfdc4a4998f93e257
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
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: Ia46f2d16e4642c9e14b8b72428f1afc31a9ba4c2
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
guillaume.lambert [Thu, 29 Nov 2018 13:53:58 +0000 (14:53 +0100)]
Bump TPCE dependencies
Change-Id: Iad376b83d8c611e0c5028cf31affd2823f7759f5
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Tue, 27 Nov 2018 09:57:10 +0000 (10:57 +0100)]
Bump to yangtools 2.0.13
Change-Id: I17d5fb4a638faec14335a05a90feed79f79029b4
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
doha.khaled [Thu, 22 Nov 2018 13:17:32 +0000 (15:17 +0200)]
OLM unit testing update
Change-Id: Ib3865fa80b375142bf803619c6359c7a31fbbc54
JIRA: TRNSPRTPCE-59
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
shweta [Thu, 4 Oct 2018 21:50:56 +0000 (17:50 -0400)]
added OSNR calculation logic into PCE
Change-Id: I85506d160c0cc30ec3b7b6df68031d3923635133
JIRA: TRNSPRTPCE-51
Signed-off-by: shweta <sv111y@att.com>
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
Change-Id: Iff6db6a135a0a6a608572e3b4ba8713bf57e4631
JIRA: TRNSPRTPCE-53
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
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
Change-Id: I7d02d573a55ec61bb6c310a458d845e5393937db
JIRA: TRNSPRTPCE-34
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
Martial COULIBALY [Fri, 16 Nov 2018 16:11:03 +0000 (17:11 +0100)]
ROADM To ROADM Path Calculation on unidir ports
Change-Id: Ia93556daee7c4765e735a3b2fc6dda5a90055795
JIRA: TRNSPRTPCE-52
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
doha.khaled [Thu, 15 Nov 2018 06:14:30 +0000 (08:14 +0200)]
initial olm unit testing commit
Change-Id: I9cb9b69e7c215c899f31f5e49485482fe82a18ca
JIRA: TRNSPRTPCE-59
Guillaume Lambert [Wed, 14 Nov 2018 10:15:25 +0000 (10:15 +0000)]
Merge "ROADM To ROADM Path Calculation"
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Guillaume Lambert [Thu, 18 Oct 2018 13:23:45 +0000 (13:23 +0000)]
Merge "Honeynode Enhancements"
Guillaume Lambert [Thu, 18 Oct 2018 12:47:23 +0000 (12:47 +0000)]
Merge "Push service name to interfaces"
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>
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>
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>
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>
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>
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>
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>
Guillaume Lambert [Thu, 13 Sep 2018 13:01:12 +0000 (13:01 +0000)]
Merge "fix netconf testtool portmapping"
Guillaume Lambert [Thu, 13 Sep 2018 13:00:07 +0000 (13:00 +0000)]
Merge "Update unit testing - Renderer"
Guillaume Lambert [Thu, 13 Sep 2018 12:59:52 +0000 (12:59 +0000)]
Merge "fix more javadocs warnings"
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
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>
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>
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)
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>
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>
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>
Dhruv Bhardwaj [Tue, 7 Aug 2018 19:41:46 +0000 (15:41 -0400)]
Add check in cp state to avoid npe
Change-Id: I27469f5e95e7a20a5110628515ce099e760d1a51
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:40:45 +0000 (14:40 -0400)]
Removed debug statement
Change-Id: Iabb51395f3ef8256da307d63b996d4c4612eead7
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:37:23 +0000 (14:37 -0400)]
Update xponder portmapping
Change-Id: Ib740319fc4b5ee9e6cd3a9b6e275f1321b465ec5
Dhruv Bhardwaj [Tue, 7 Aug 2018 18:24:22 +0000 (18:24 +0000)]
Merge "Fix Issues coming up during end to end testing"
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
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>
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>
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>
Gilles Thouenon [Thu, 26 Jul 2018 10:08:32 +0000 (12:08 +0200)]
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>
Gilles Thouenon [Wed, 25 Jul 2018 11:26:48 +0000 (13:26 +0200)]
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>
Martial COULIBALY [Wed, 1 Aug 2018 13:38:29 +0000 (15:38 +0200)]
fix unit test Renderer
JIRA: TRNSPRTPCE-11
Change-Id: Ibf13f1af6ba04755c624ee58e6a5520e14c44adc
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
guillaume.lambert [Wed, 1 Aug 2018 13:04:04 +0000 (15:04 +0200)]
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>
Martial COULIBALY [Thu, 26 Jul 2018 13:34:53 +0000 (15:34 +0200)]
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>
guillaume.lambert [Wed, 25 Jul 2018 15:36:17 +0000 (17:36 +0200)]
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>
guillaume.lambert [Fri, 20 Jul 2018 15:44:29 +0000 (17:44 +0200)]
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>
Stephen Kitt [Wed, 11 Jul 2018 14:19:12 +0000 (16:19 +0200)]
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>
guillaume.lambert [Mon, 30 Jul 2018 17:13:15 +0000 (19:13 +0200)]
Remove Karaf4 useless features
Change-Id: I02496ac1574d2094eb937fa995cad251ec94cafc
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Mon, 23 Jul 2018 15:15:35 +0000 (17:15 +0200)]
fix some compilation warnings
Change-Id: I73d5b4906d85cfc2ab6e2457335192e8a8d19ce7
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
doha.khaled [Tue, 24 Jul 2018 11:04:21 +0000 (13:04 +0200)]
Initial unit testing commit - Renderer
JIRA: TRNSPRTPCE-11
Change-Id: Iae7f1d5d4e4b8d9ba3227b5debcc30437220d460
guillaume.lambert [Mon, 23 Jul 2018 14:42:26 +0000 (16:42 +0200)]
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>
Dhruv Bhardwaj [Mon, 9 Jul 2018 04:25:04 +0000 (00:25 -0400)]
RPC to delete link
Implemented RPC to delete link with a given link-id
JIRA: TRNSPRTPCE-16
Change-Id: I722002997250d4dd07a2f9195f4828eecc7dcfee
Gilles Thouenon [Thu, 5 Jul 2018 14:01:12 +0000 (16:01 +0200)]
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>
doha.khaled [Thu, 12 Jul 2018 10:55:29 +0000 (12:55 +0200)]
ServiceHandler unit testing update
The Complete unit testing for the ServiceHandler module
Change-Id: Ica4bbba4e94bd46c8c44d965071fe0409abd4637
doha.khaled [Thu, 5 Jul 2018 13:52:03 +0000 (15:52 +0200)]
Service Handler unit test update
-serviceReroute
-PCEServiceWrapper
Change-Id: I0f77e47d1b246c9349c15c50b9a0187d099053dd
Ahmed Triki [Fri, 6 Jul 2018 07:31:35 +0000 (09:31 +0200)]
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>
Ahmed Triki [Thu, 26 Jul 2018 13:50:53 +0000 (15:50 +0200)]
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>
Ahmed Triki [Thu, 28 Jun 2018 09:22:34 +0000 (11:22 +0200)]
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>
Martial COULIBALY [Fri, 27 Jul 2018 12:15:22 +0000 (14:15 +0200)]
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>
Martial COULIBALY [Tue, 24 Jul 2018 13:08:30 +0000 (15:08 +0200)]
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>
Gilles Thouenon [Thu, 5 Jul 2018 10:07:10 +0000 (12:07 +0200)]
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>
Martial COULIBALY [Tue, 3 Jul 2018 12:53:07 +0000 (14:53 +0200)]
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>
Martial COULIBALY [Tue, 3 Jul 2018 14:19:51 +0000 (16:19 +0200)]
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>
doha.khaled [Thu, 14 Jun 2018 11:35:19 +0000 (13:35 +0200)]
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>
Shweta V [Wed, 20 Dec 2017 11:14:14 +0000 (12:14 +0100)]
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>
Martial COULIBALY [Fri, 20 Jul 2018 07:11:31 +0000 (09:11 +0200)]
fix karaf runtime log console
JIRA: TRNSPRTPCE-6
Change-Id: I6f7b46c77f54742a02de2b8200d04e3592f34bea
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
guillaume.lambert [Thu, 5 Jul 2018 14:16:19 +0000 (16:16 +0200)]
fix some compilation warnings
Change-Id: I007c87de212afbc58ad91965eeefa3649066c375
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Shweta V [Wed, 20 Dec 2017 11:12:58 +0000 (12:12 +0100)]
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>
guillaume.lambert [Tue, 3 Jul 2018 14:20:31 +0000 (16:20 +0200)]
fix build configuration and dependencies
repair project build by correcting dependencies import
Change-Id: Id4c6beb550d81a6f00dd76315801b411b4c1bd23
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Shweta V [Wed, 20 Dec 2017 11:15:51 +0000 (12:15 +0100)]
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>
guillaume.lambert [Mon, 18 Jun 2018 15:08:46 +0000 (17:08 +0200)]
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>
Gilles Thouenon [Wed, 6 Jun 2018 14:21:42 +0000 (16:21 +0200)]
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>
Dhruv Bhardwaj [Mon, 18 Jun 2018 03:44:47 +0000 (23:44 -0400)]
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>