guillaume.lambert [Sat, 29 Jan 2022 11:38:08 +0000 (12:38 +0100)]
Fix func. tests utils base URL generation issue
RESTCONF base URL is generated by concatenating a string to a
configurable port number.
This port number is loosely typed with an integer.
If this is working well on most systems, it has been reported this
concatenation raises an error on some installation.
Casting explicitly the port number to a string in the concatenation
should solve the issue.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iff503422cf3a881b178618a439d810c918b52953
Guillaume Lambert [Fri, 28 Jan 2022 23:00:53 +0000 (23:00 +0000)]
Merge "Revert "Device renderer functional tests intermediate rate""
Guillaume Lambert [Fri, 28 Jan 2022 22:45:10 +0000 (22:45 +0000)]
Revert "Device renderer functional tests intermediate rate"
This reverts commit
2ca7fed08ba82bf718c9805ea4eca1e2b6a8b147.
Reason for revert: comments acked without any answer, not enough time let for other committers review
Change-Id: I29e9f66de98e5462ec5dc2874f39d2aa1daeea10
Balagangadhar Bathula [Sun, 23 Jan 2022 17:59:07 +0000 (12:59 -0500)]
Update transportpce-topology enums
- Add OTUC2 (ODUC2), OTUC3 (ODUC3) enums
- These OTN-link type are needed in support of
end-to-end intermediate rates
JIRA: TRNSPRTPCE-526
Change-Id: I2b65a5f53510b5372ec691e7a23130e83a0b2558
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Balagangadhar Bathula [Wed, 19 Jan 2022 20:52:24 +0000 (15:52 -0500)]
Device renderer support for 100G on 7.1 models
- Support If-OCH-OTU4-ODU4 service on 7.1 models
- Enable 7.1 device renderer to create OCH, OTU4, and
ODU4, Ethernet-100G interfaces
- Create and delete the interfaces accordingly.
JIRA: TRNSPRTPCE-498
Change-Id: I5054f12972ef259db9ac2bc2cd29f25be3a7abf4
Balagangadhar Bathula [Wed, 19 Jan 2022 05:11:20 +0000 (00:11 -0500)]
Add support for 200G with 31.6 Gbaud
- For 31.6 Gbaud the 200G line rate uses
DP-QAM16 with FOIC-2.8
JIRA: TRNSPRTPCE-587
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I176a632d40cfb4d1339cbc14ee4c9c8c5a273a0b
Balagangadhar Bathula [Tue, 18 Jan 2022 06:43:24 +0000 (01:43 -0500)]
Device renderer functional tests intermediate rate
- Functional tests to perform device and otn renderer
service path.
- This includes, ODUC2 (ODUC3, ODUC4), OTUC2 (OTUC3, OTUC4),
and Ethernet
JIRA: TRNSPRTPCE-528
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Ieff7b700841d125f2b95cb10dbe60671e25c5430
Balagangadhar Bathula [Fri, 28 Jan 2022 15:43:39 +0000 (10:43 -0500)]
Device renderer support for intermediate rates
- Includes 200G (2x100G), 300G (3x100G) line rates
- OTUC2 (ODUC2), OTUC3 (ODUC3) support
- Create and delete interfaces.
- Modify functional-tests wherever necessary.
JIRA: TRNSPRTPCE-525
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I7e45d129b3016037626e710c3de95907a1b00cab
Balagangadhar Bathula [Sat, 15 Jan 2022 15:11:48 +0000 (10:11 -0500)]
Change in interface naming convention (B100G)
- For intermediate rates we need to differentiate
OTSI group interface name to extract rate.
- Change "OTSI-GROUP" to "OTSIGROUP"
- Appending "-x00G" to the OTSi-Group interface
name, where x = 2, 3, or 4.
- OTUCn (ODUCn), where n = 2, 3, or 4
JIRA: TRNSPRTPCE-585
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I84540954d357b68c9255af34b1bfc1ea13035752
guillaume.lambert [Wed, 26 Jan 2022 11:46:12 +0000 (12:46 +0100)]
Migrate renderer func. tests to RFC8040
JIRA: TRNSPRTPCE-567 TRNSPRTPCE-591
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2224de8c5c23aefd941317a6d8390ed598d62719
guillaume.lambert [Tue, 25 Jan 2022 18:29:01 +0000 (19:29 +0100)]
Refactor func. tests RFC8040 utils
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I909a7110bed2aa135c8ff59edde0fef8fe8c37ac
guillaume.lambert [Thu, 20 Jan 2022 14:56:28 +0000 (15:56 +0100)]
Migrate flex grid func. tests to RFC8040
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iaec360b1e9e5946f909b00b413952d7d8b16fde1
Guillaume Lambert [Mon, 24 Jan 2022 19:00:32 +0000 (19:00 +0000)]
Merge changes I26dad4b3,Icb22e78d
* changes:
Improve some func. tests variables naming
Migrate OTN topology func. tests to RFC8040
guillaume.lambert [Fri, 21 Jan 2022 07:55:49 +0000 (08:55 +0100)]
Improve some func. tests variables naming
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I26dad4b37aee51934d7c90379eccf44105828098
guillaume.lambert [Wed, 19 Jan 2022 15:41:18 +0000 (16:41 +0100)]
Migrate OTN topology func. tests to RFC8040
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icb22e78df1f6728dfead4f23277517e7a41eb596
Balagangadhar Bathula [Fri, 14 Jan 2022 16:45:54 +0000 (11:45 -0500)]
Generalize supporting interface (B100G) in port-mapping
- Change supporting-oduc4 and supporting-otuc4 leafs to
supporting-oducn and supporting-otucn.
- Change the port-mapping revision for this change.
JIRA: TRNSPRTPCE-525
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I45ae8e7cc9189af53211e7f2100514b2b0953b98
Balagangadhar Bathula [Wed, 5 Jan 2022 22:59:07 +0000 (17:59 -0500)]
Add missing ODUFlex interface
- 400G device renderer is missing ODUFlex interface
creation.
- Add functional test to verify creation of ODUFlex
interface.
JIRA: TRNSPRTPCE-582
Change-Id: Ia428e72a3320a83bfd887c9d9973a33e90699ef3
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Guillaume Lambert [Wed, 12 Jan 2022 13:00:44 +0000 (13:00 +0000)]
Merge "Removing the maint-testsignal container"
guillaume.lambert [Mon, 10 Jan 2022 10:32:47 +0000 (11:32 +0100)]
Use lighty-core build rather than package dep
Ligthy-core package available on maven central still consumes netconf
version 2.0.9 with a bug making part of logs totally unreadable
(hexadecimal log messages).
Current repo now consumes version 2.0.11 that fixes this bug.
https://github.com/PANTHEONtech/lighty/issues/888
JIRA: TRNSPRTPCE-579 NETCONF-835
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6dc33698b084232c67a7f9f6e1f7bebd7e3f9545
guillaume.lambert [Mon, 10 Jan 2022 11:12:37 +0000 (12:12 +0100)]
Update maven download URL & fix gate
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4a03af89d78afa0d3655841acb7ee66800bf54c6
Balagangadhar Bathula [Wed, 5 Jan 2022 22:52:34 +0000 (17:52 -0500)]
Removing the maint-testsignal container
- Maint-testsignal container is needed only when
admin-state is in maintenance.
- InService admin-state does not need maint-testsignal.
JIRA: TRNSPRTPCE-456
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Id28dc697a0db30d7f559a68b8e6bb6fa9cdda39c
Gilles Thouenon [Tue, 14 Dec 2021 16:14:43 +0000 (17:14 +0100)]
Use environment variables for OLM timers
- Allow injection of environment variables in OLM blueprint to modify
the default value of OLM timers
- Adapt tox configuration for functional tests
- update user-guide
JIRA: TRNSPRTPCE-580
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I3e649f17159ae852aa00d14f4e089c1f599f2c11
guillaume.lambert [Mon, 13 Dec 2021 10:33:45 +0000 (11:33 +0100)]
Add and fix Phosphorus lighty.io support
- fix tapiLink uninitialized variable
- fix initPortMapping calls
- modify PortMapping and PortMappingImpl to be able to get
PortMappingVersion221 instance
- fix initOpenRoadmInterfaces calls by using it
- add to pom the org.eclipse.jetty dependency removed from lighty-core
- limit its scope to tests only
JIRA: TRNSPRTPCE-579
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I31e8a0a58d7f7e342a7119f364975eb0096f5e55
Gilles Thouenon [Fri, 17 Dec 2021 06:53:17 +0000 (06:53 +0000)]
Merge "Fix few NPE in TAPI implementation"
guillaume.lambert [Wed, 24 Nov 2021 14:52:09 +0000 (15:52 +0100)]
Enforce pylint in CI via tox
- ignore duplicate-code and fixme detection in pylint profile
fixme comments are fine and dup warnings contain many false positives
- enforce pylint with a minimal output and a score of 10 in CI
- create a "pylint_full" tox profile to display complete output
with duplicate-code and fixme detections
- specify version requirement >=2.6.0 for a correct support of options,
especially the option --fail-under= to specify minimum score allowed
JIRA: TRNSPRTPCE-320
LF-JIRA: IT-23316
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I41f218d7f33f1f620a3f3c4d442655bf1cfb4ded
Gilles Thouenon [Thu, 16 Dec 2021 14:46:10 +0000 (15:46 +0100)]
Fix few NPE in TAPI implementation
JIRA: TRNSPRTPCE-581
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Iae4a6b32bbe104ce62f04271fd562aacd3b12a41
Vachhani, Shweta (sv111y) [Fri, 14 May 2021 21:29:29 +0000 (17:29 -0400)]
Power control support for 87.5GHz spectrum width
Update OLM PowerMgmtImpl to support power calculation based on Media
Channel with 87.5GHz slot width.
- Modify optical-renderer-input to have nmc and mc width
Renderer will use nmc-width while olm will use mc-width.
- Adapt renderer UT
JIRA: TRNSPRTPCE-461
Signed-off-by: Vachhani, Shweta (sv111y) <sv111y@att.com>
Change-Id: I290e1437ec38dd11a01f1a07b1b91613792c9143
Guillaume Lambert [Wed, 15 Dec 2021 11:53:16 +0000 (11:53 +0000)]
Merge "Fix Log message in OLM provider"
Gilles Thouenon [Wed, 15 Dec 2021 09:30:08 +0000 (10:30 +0100)]
Fix Log message in OLM provider
JIRA: TRNSPRTPCE-570
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ibc274f67a3c63a16687a57860ee1d99b433cf8fb
Balagangadhar Bathula [Wed, 22 Sep 2021 17:46:01 +0000 (13:46 -0400)]
Unofficial regenerator capability support in YANG
Some non-compliant Open ROADM devices propose an additional regen
identity 'if-OTUCn-ODUCn-regen' in the common Open ROADM YANG model
org-openroadm-port-types
Though this identity should have been advertised through a deviation,
this does not raise any compatibility problem with compliant devices.
This ideally temporary work-around proposes to integrate this unofficial
regen identity until a compliant solution is found.
JIRA: TRNSPRTPCE-532
Change-Id: Ib63b8fb67e7afbf0889eb1916c132d8058df540e
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Gilles Thouenon [Mon, 29 Nov 2021 07:59:43 +0000 (08:59 +0100)]
Remove forced revision imports in few tpce models
Allow importing the latest revision of some models when upgrading
openroadm yang models
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3ec0633fec25c016605e9644eb285c7f815120cd
Gilles Thouenon [Wed, 20 Oct 2021 14:33:12 +0000 (16:33 +0200)]
Reactive renderer UT
JIRA: TRNSPRTPCE-554
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I57c811b61e09522037779f26f3c3e9559e1cb188
errea [Fri, 26 Nov 2021 14:20:54 +0000 (15:20 +0100)]
OTN link deletion from full-multilayer TAPI topo
OTN links should be translated into TAPI connections.
For T0 Full Multilayer this already happens when mapping OR services.
For T0 Multi layer, OTN links still remain abstracted when we query
getTopologyDetails, for compatibility issue.
JIRA: TRNSPRTPCE-576
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I913a6ebc9d0a3f66e269913e61c5b6ea6ecbdfaf
errea [Tue, 30 Nov 2021 13:40:55 +0000 (14:40 +0100)]
TAPI connectivity upgrade
- Implementation of WDM 100GBE service in T-API
as an ETH service
- Implementation of OTN services for Mxpdr &
Swtchpdr use cases
- Differentiation between XPDR type with new
value in TAPI node Name attribute
- Upgrade connection list of connectivity service
to include only TOP connections. Cross connections
should be referenced inside the Top Connection in the
lower connection list attribute
- Create switching pool in TAPI node for Tpdr node which
reflects the NETWORK to CLIENT port connection map
- Adapt tests
JIRA: TRNSPRTPCE-577
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I39ef19626285f3131dc997a056de64c799ff26c3
errea [Sat, 27 Nov 2021 00:06:47 +0000 (01:06 +0100)]
Openroadm Xpdr link TAPI listener
Automatic creation of TAPI XPDR link when a
new OpenROADM XPDR-RDM link is created using
the NetworkUtils RPCs
JIRA: TRNSPRTPCE-549
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I603d9ea435acfa9ddc17ef05ceec4f8a7444a45e
errea [Sat, 27 Nov 2021 18:10:40 +0000 (19:10 +0100)]
Unification iNodeEdgePoint_N & NodeEdgePoint_N
- T0 Full Multilayer topo and T0 Multilayer topo have the same
name and uuid for the NEP in the ODU layer that belongs to
the DSR/ODU TAPI node
- Name of NEPs in T0 MultiLayer updated to be built the same
way as in T0 Full MultiLayer
JIRA: TRNSPRTPCE-551
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I48d218bcc210650a794ecb4cb3a6dcf33b5cc04f
Guillaume Lambert [Fri, 10 Dec 2021 08:18:57 +0000 (08:18 +0000)]
Merge changes I9991ee73,I26c6f70d,I8be28014,I7f500261
* changes:
Migrate topology func. tests to RFC8040 Step 3
Migrate topology func. tests to RFC8040 Step 2
Reintroduce nb-bierman02 support in new func tests
Migrate topology func. tests to RFC8040 Step 1
Gilles Thouenon [Wed, 6 Oct 2021 10:05:07 +0000 (12:05 +0200)]
New functional tests with intermediate otn switch
Create a new functional test suite testing the end-to-end 10GE service
management in a configuration with an intermediate otn-switch. It tests
the creation of an end-to-end structured ODU4 over multiple OTU4, and
the creation of an end-to-end 10GE service over multiple structured
ODU4.
JIRA: TRNSPRTPCE-542
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: If33dd450b466b823733521151f364df8a45f1eba
Gilles Thouenon [Wed, 6 Oct 2021 09:59:47 +0000 (11:59 +0200)]
Manage low order otn services over multiple ODU4
- adapt renderer to transmit in the notification the list of supported
ODU4 links
- update updateOtnLinks method in network module to also transmit in
this case the list of supporting ODU4 links
JIRA: TRNSPRTPCE-541
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ib5bf4aeac21a87ba9b7a7fe8f1c41833e57b475b
Gilles Thouenon [Mon, 4 Oct 2021 15:03:08 +0000 (17:03 +0200)]
Rationalize OpenRoadmInterface221
- Introduce payloadType for ODU interface creation
- Remove useless older methods
- Adapt fonctional tests
- Fix bug in renderer
JIRA: TRNSPRTPCE-544
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iaed962eb90e356e7baa123941bdf3ff0a7444ceb
Gilles Thouenon [Fri, 1 Oct 2021 13:47:11 +0000 (15:47 +0200)]
Manage ODU4 services over multiple OTU4
- in pce module, remove the exclusive "AZ" mode to allow also the
"intermediate" mode
- in network module, modify signature of createOtnLinks, updateOtnLinks
and deleteOtnLinks mehtods to take into acount a list of supporting
links
- in renderer module, rationalize the OpenRoadmInterface creation,
taking into account data coming from portmapping
(supporting-interfaces), setting the sapi/dapi info comming from the
specific input container, updating the mapping once the interface has
been created...
- adapt UT and functional tests consequently (notably, disable test 82
in B100_end2end test suite - resolved in the change 97834)
JIRA: TRNSPRTPCE-541
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I3e6b89ee22aa5c653e6740d6efffb00038910f26
Gilles Thouenon [Fri, 1 Oct 2021 13:25:50 +0000 (15:25 +0200)]
Introduce s/d ApiInfo in otn-service-path
Set the AEndApiInfo and ZEndApiInfo containers directly from the
path-description in the otn-service-path input in order to have all
necessary information to correctly set the sapi en dapi data during the
odu-interface creation.
JIRA: TRNSPRTPCE-540
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I90bbf7e2c3374626560b25f03b841cf641a71756
Gilles Thouenon [Fri, 1 Oct 2021 13:08:30 +0000 (15:08 +0200)]
Modify OpenRoadmInterfaces implementations
When we create a new interface on a device, we need to take into account
this new interface just after the mapping update. Unfortunatelly, it
may happen sometimes that the new interface is not present yet in the
operational device datastore at the moment the mapping update occurs.
To avoid such roll-back root cause error, this change modifies the
postInterface method to introduce a check of the new interface presence
before returning. As for the deleteInterface method, it also invokes
the mapping update to remove supporting-interfaces.
JIRA: TRNSPRTPCE-539
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I61dfc1021a32626341f69922749bf1f9ba9a1062
Gilles Thouenon [Thu, 14 Oct 2021 11:00:17 +0000 (13:00 +0200)]
Fix: Deletion of 121 and 71 interfaces
- Fix a race condition as it had been done for 221 interfaces
- Fix bug when configuring the interface at 'out of service'
JIRA: TRNSPRTPCE-544
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I55ba5f2e669b81da06c459abe47e9f9206d31edc
Gilles Thouenon [Fri, 1 Oct 2021 12:22:04 +0000 (14:22 +0200)]
Adapt the updateMapping method
- Allow the setting/deletion of supporting-otu/odu interfaces in the
mapping after creation/deletion of these interfaces by the renderer.
- add a small delay in renderer 221 functional tests because they
sometimes fail.
JIRA: TRNSPRTPCE-538
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I61c8ef522fb86318eb552f3a5b397168a2be9349
Gilles Thouenon [Fri, 1 Oct 2021 12:17:35 +0000 (14:17 +0200)]
Change PortMapping implementations
Generalizing the update of mapping during openroadm-interface creation/
deletion imposes to remove OpenRoadmInterfaces injections from
PortMapping implementations. Getting interfaces from device may be
directly managed from the portmapping implementation.
JIRA: TRNSPRTPCE-538
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Icc6c560790f030f8ef034b0ed3123145aeaf0c9b
Gilles Thouenon [Fri, 1 Oct 2021 12:10:55 +0000 (14:10 +0200)]
Add new method in PortMapping interface
- change the name of deleteMappingData method to deletePortMappingNode
to be more explicit about the deletion of the all port-mapping node when
disconnecting a node
- create a new deleteMapping method that remove a given mapping from the
mapping list for a given node. Such method is necessary when we want to
update a mapping removing one leaf (typically, supporting odu and otu
interface of xponder when we delete ODU4 or OTU4 services).
JIRA: TRNSPRTPCE-538
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I477b7a6ddbf3a97b65e12ec317271d45a3a83da3
Gilles Thouenon [Mon, 27 Sep 2021 13:46:34 +0000 (15:46 +0200)]
Update portmapping model
- Add the supporting-otu interface in the mapping, as it is the case for
other kind of interfaces, to ease and rationalize the setting of the
interface during its creation.
- update imports
JIRA: TRNSPRTPCE-533
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I1c272f5cb1677da5757f3ff4dc64632abefad06a
Gilles Thouenon [Fri, 8 Oct 2021 08:47:51 +0000 (10:47 +0200)]
Fix bug in setting rate of tp in network module
Depending on the first SupportedInterfaceCapability, it may happen that
the if-10GE if-cap-type is chosen, for which no rate is allocated. Look
at other if-cap-type to determine the rate.
JIRA: TRNSPRTPCE-541
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie174c9c6b0329d9ffd65971ab140289a13fe3856
errea [Thu, 25 Nov 2021 21:28:12 +0000 (22:28 +0100)]
Adaptation of XPDR mapping from OR to TAPI
- eODU nep creation depends on CLIENT ports
- SIP of eODU nep is removed and given to iODU nep
- ODU connectivity service between iODU SIPs
- 2 Top connections in the ODU layer:
one for HO_ODU (iODU) and one for LO_ODU (eODU)
- Adapt tests to changes
- Prepare for iODU and NodeEdgePoint-N unification
JIRA: TRNSPRTPCE-575
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: Ia3d509aad651d4fc9bbf03580d1090ce09166bff
errea [Thu, 25 Nov 2021 13:42:49 +0000 (14:42 +0100)]
TapiLink creation refactoring
- Unification of tapiCreateLink in TapiLink util
- Creation of TapiStringConstants to avoid duplication
of String variables
- Adaptation of tests, blueprint and lighty
- T-API link name unification: ORNodeId+LayerProtoQual+ORTpId
JIRA: TRNSPRTPCE-561
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I976c1b10380ed355b60878b41a6c7a0bc2558a68
errea [Fri, 19 Nov 2021 16:12:29 +0000 (17:12 +0100)]
Fix tapi get-topology-details functional test
- Replace databroker with networkTransactionService in
R2RTapiLinkDiscovery
- Add specific LOG message to enable tapi tests to
know when the device has been successfully connected
and translated in the TAPI topology
- Add connect_xpdr_to_rdm_tapi_request and mount_tapi_device
tests in test_utils which will be called from
test12_tapi_full_multi_layer
JIRA: TRNSPRTPCE-553
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: Iff6811d19861521733de1667c49ba4793fa35b2c
guillaume.lambert [Sun, 5 Dec 2021 19:09:47 +0000 (20:09 +0100)]
Migrate topology func. tests to RFC8040 Step 3
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9991ee7377581dda4dc72ee5c65db203f65ffce6
guillaume.lambert [Sat, 4 Dec 2021 13:34:13 +0000 (14:34 +0100)]
Migrate topology func. tests to RFC8040 Step 2
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I26c6f70db1a97743be1c84fd987bf79c2c7ec0b0
guillaume.lambert [Fri, 3 Dec 2021 19:57:49 +0000 (20:57 +0100)]
Reintroduce nb-bierman02 support in new func tests
Up to now, migrated tests no more supported legacy bierman02 draft
RESTCONF queries, and only RFC8040.
With a few adaptations, they can now be configured to reuse this old
RESTCONF version via an environment variable.
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8be28014be2c572c7555865d4af76988e30bf9ac
guillaume.lambert [Wed, 1 Dec 2021 14:53:50 +0000 (15:53 +0100)]
Migrate topology func. tests to RFC8040 Step 1
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I7f500261cb0a189a368ac4b985b9514b296b81f4
Gilles Thouenon [Tue, 30 Nov 2021 17:45:29 +0000 (18:45 +0100)]
Set xponder-type in the mapping for Transponders
- Set the xponder-type in the mappings corresponding to traffic ports of
transponders, as it is done for otn-xponders
- Adapt functional tests
JIRA: TRNSPRTPCE-578
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Iea7e83225acc0d754dec003d4ea8ac19d7461972
guillaume.lambert [Mon, 29 Nov 2021 13:38:38 +0000 (14:38 +0100)]
Fix remaining pylint warnings apart fixme & dup
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I256c36f1059783a26fa0e30292de3c2c1781376b
Guillaume Lambert [Wed, 1 Dec 2021 10:44:57 +0000 (10:44 +0000)]
Merge changes I018b69e8,Ia99c607c,Idc241d22
* changes:
Fix more and more pylint warnings
Fix more pylint warnings
Fix some pylint warnings
guillaume.lambert [Fri, 26 Nov 2021 11:49:20 +0000 (12:49 +0100)]
Fix more and more pylint warnings
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I018b69e8b73abba2faac4a1e5ae332010b13e9b3
guillaume.lambert [Fri, 26 Nov 2021 10:45:04 +0000 (11:45 +0100)]
Fix more pylint warnings
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia99c607c48ad4a6bb305bf800e8f54d1f741e4df
guillaume.lambert [Wed, 24 Nov 2021 08:40:30 +0000 (09:40 +0100)]
Fix some pylint warnings
JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Idc241d222c0b52ce90318f1b63f6f9e0fc3b114b
Gilles Thouenon [Mon, 29 Nov 2021 07:19:53 +0000 (08:19 +0100)]
Bump netconf dependency to 2.0.11
Avoid having sshd hexadecimal traces in our logs.
JIRA: TRNSPRTPCE-565
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I50eb8d485eef4d17a41aaee1b77e2c9ee732d793
Christophe Betoule [Tue, 23 Nov 2021 13:41:43 +0000 (14:41 +0100)]
Bump netconf dependency to 2.0.10
JIRA: TRNSPRTPCE-565
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ie552d9c91f01bb10cd2e57a7f463a24f6935aa33
guillaume.lambert [Thu, 28 Oct 2021 07:48:24 +0000 (09:48 +0200)]
Migrate portmapping functional tests to RFC8040
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie6150a68a4a588c06979b27a1753ee5cb9bc283c
guillaume.lambert [Fri, 29 Oct 2021 10:31:17 +0000 (12:31 +0200)]
Remove u prefix obsoleted by python 3
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib0913157fa97f418dd846124d4fdc3d97250ca0a
guillaume.lambert [Fri, 29 Oct 2021 09:51:54 +0000 (11:51 +0200)]
Enforce autopep8 via pre-commit
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia0021347c46488ecc2a922f4e370ca5ad4edafd9
guillaume.lambert [Fri, 29 Oct 2021 09:34:03 +0000 (11:34 +0200)]
Run pre-commit autoupdate
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9dda524f19b15dbb6195e586ed93f2e04202a416
guillaume.lambert [Fri, 29 Oct 2021 09:30:37 +0000 (11:30 +0200)]
Ignore python local imports in PEP8 linters
To work correctly, test_utils imports must be after
sys.path.append('transportpce_tests/common/')
The " # nopep8" comment prevents autopep8 to move them before.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifb91716a94acf20732ffc2e0f625b32b79c874d6
Gilles Thouenon [Wed, 15 Sep 2021 09:48:35 +0000 (11:48 +0200)]
New functional test suite of otn-swith 2.2.1
Create a new functional test suite testing the end-to-end 100GE service
management over two (or more) otn-switch. Two uses cases are verified:
- when two otn-switch are used as "AZ" node, at the termination of the
service
- when a thrid otn-switch is used as "intermediate" node, serving as an
otn-regenerator. In such a case, the 100GE/ODU4 service is supported by
two OTU4 server links.
Also update simulator configuration files to perform such a network
configuration with 3 ROADMs and 3 otn-switches. Adapt some functional
tests consequently.
Finally, rename tapi functional test to keep sequence logical.
JIRA: TRNSPRTPCE-530
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I117a1426d6ecabeeb2a170779846f08201f32d02
Gilles Thouenon [Mon, 15 Nov 2021 10:16:43 +0000 (11:16 +0100)]
Bump netconf dependency to 2.0.9
JIRA: TRNSPRTPCE-565
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: If419f55de49d788cba7b9f8897fc3bf7106c7531
Gilles Thouenon [Thu, 16 Sep 2021 08:03:17 +0000 (10:03 +0200)]
Enable 100GE service over multiple OTU4 links
Creating/deleting a 100GE service over more than 2 otn-switches imposes
to be able to update bandwidth parameters of multiple supported OTU4
links in otn-topology. To that end, it is necessary to apply some
changes in the notification transmits from the renderer towards service
handler.
- introduce leaf-list link-id used in the case where we have more than 1
bidirection supported link
- adapt the updateOtnLinks method signature to take the list into acount
- add a new method in renderer/ModelMapingUtils to extract OTU links
directly from a service-path-description
- update import revision of transportpce-renderer model
JIRA: TRNSPRTPCE-531
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I401c76551e51666fa20c63ef8c2a141a6e064654
Gilles Thouenon [Mon, 13 Sep 2021 11:13:54 +0000 (13:13 +0200)]
Fix renderer for 100GE on intermediate OTN Switch
This issue appeared when a 100GE service is routed through an
intermediate otn-switch. The otn-service-path rpc was not filled
correctly.
Fix also the monitored mode of the ODU4-CTP termination point when
supporting the 100GE client signal.
JIRA: TRNSPRTPCE-499
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I22bcb38388c9adf9e046f01946afbe7ce53d348f
Gilles Thouenon [Mon, 13 Sep 2021 11:05:32 +0000 (13:05 +0200)]
Adapt PCE to compute a 100GE path on OTN Switch
Fixes some issues in PCE when an OTN switch is used as an intermediate
switch.
JIRA: TRNSPRTPCE-499
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ica1468195c0e193d80dc38bd8f5dadebae0d8769
Gilles Thouenon [Thu, 9 Sep 2021 13:41:39 +0000 (15:41 +0200)]
Adapt renderer to manage 100GE service on Switch
- Add new method in OpenRoadmInterface221 to create ODU4 interface as
an HighOrder interface (to support 100GE flow)
- manage the creation/deletion of Ethernet, ODU4-Client, ODU4-Network
and odu-connection to support the 100GE service over an OTN switch
- manage the new 100GE_S service-type in OtnDeviceRendererService
- propagate the service-type inside the renderer in order to have to
determine it only once at the highest renderer level
(RendererServiceOperations)
JIRA: TRNSPRTPCE-499
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I23f4df43a66f3d4de8f75687219d3ffa0c148ba5
Gilles Thouenon [Thu, 9 Sep 2021 13:23:29 +0000 (15:23 +0200)]
Adapt network module to update OTU links only
Add a new updateOtnLink method in NetworkModelService and implement it
to update bandwidth parameters of OTU4 links only when creating/deleting
100GE service that is not supported over a structured ODU4. This is the
case when the service is terminated on an OTN Switch.
JIRA: TRNSPRTPCE-512
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I9db5ecaba843093b3a9543ef9e24b03ff3a227fb
Gilles Thouenon [Thu, 9 Sep 2021 13:02:32 +0000 (15:02 +0200)]
Fix javadoc in CrossConnect interface
JIRA: TRNSPRTPCE-511
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ibce010eb83a1280264285070e584bb71f8fd12a9
Gilles Thouenon [Tue, 7 Sep 2021 12:24:47 +0000 (14:24 +0200)]
Introduce the 100GE_S service type in PCE
This service-type allows path computation for a 100GE service terminated
on a 100G OTN switch.
JIRA: TRNSPRTPCE-499
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I5085dfdcf2ed34b7df5ceec5a50651196f0bd866
Gilles Thouenon [Tue, 7 Sep 2021 12:11:25 +0000 (14:11 +0200)]
Introduce new ServiceType to use otn-switch
Will allow 100GE services supported by 100G OTN switch.
Add also UT for ServiceType class.
JIRA: TRNSPRTPCE-499
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Id111b1897c82ef26fd28d9df5033ee97cf97fffa
Gilles Thouenon [Thu, 7 Oct 2021 11:07:25 +0000 (13:07 +0200)]
Set xponder-type in portmapping
Set xponder-type for all ports of xponder to be able to distinguish
service-type 100GEs from 100GEm (and not only on network ports).
JIRA: TRNSPRTPCE-499
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I71391133ca3659fa8b3b316cafb34a8bac6a0040
Gilles Thouenon [Wed, 6 Oct 2021 15:50:31 +0000 (17:50 +0200)]
Make lcp hash computation method public
To make it available by other modules, especially at the renderer level
if we want to compute the hash for sapi/dapi at the service
configuration step.
JIRA: TRNSPRTPCE-537
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ia1b32ce5725bbe21e76af08fd3a8247d7f9abb8a
Guillaume Lambert [Wed, 10 Nov 2021 19:19:33 +0000 (19:19 +0000)]
Merge "Fix functional tests 2.2.1 sequence"
Christophe Betoule [Mon, 25 Oct 2021 14:01:12 +0000 (16:01 +0200)]
Fix rule format for ServiceUInterfacePoint
- Align multi-layer topology SIP format to the one of the full
multi-layer topology.
- SIP format becomes an UUI derived from the combination of nodeId and
tp instead of an UUID derived from the nep UUID.
- Add UT consequently
JIRA: TRNSPRTPCE-562
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I08d2ac0c5e49a32235948bea824f301cab6679c2
Guillaume Lambert [Tue, 9 Nov 2021 19:49:16 +0000 (19:49 +0000)]
Merge "Update diagram and developer guide for Si and P"
orenais [Fri, 15 Oct 2021 13:27:22 +0000 (15:27 +0200)]
Update diagram and developer guide for Si and P
Change-Id: I269bf204d41d7dc711de955cdd03f5b700af604c
Christophe Betoule [Wed, 13 Oct 2021 15:28:26 +0000 (17:28 +0200)]
TAPI functional tests
test the connectivity service creation and deletion for a 10GE service
between 10G MXPDR (PHOTONIC_MEDIA, ODU, DSR)
JIRA: TRNSPRTPCE-468
Signed-off-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I24e193810c7a2d01fa0559995a41309e64a6204c
errea [Thu, 14 Oct 2021 15:12:04 +0000 (17:12 +0200)]
Enable UUID and name in TAPI RPCs
Improvement to enable the use of either UUID or name
when performing TAPI rpcs.
JIRA: TRNSPRTPCE-564
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I8d9a2c4c25514bad0be0115a53fd6fd243187780
Javier Errea [Mon, 11 Oct 2021 14:33:36 +0000 (16:33 +0200)]
Fix null Supported CEP Qual. on TAPI node creation
Added case for ODU0 supported interface in creation method
of Supported CEP Qual.
JIRA: TRNSPRTPCE-559
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I715c710af6518865ce8c798ace40d1a0579d90ec
Javier Errea [Fri, 8 Oct 2021 11:14:32 +0000 (13:14 +0200)]
Fix getTapiNode to avoid missing ONEPs
JIRA: TRNSPRTPCE-558
Change-Id: I36b7a3a93d51104681f60fdf5d536889cdb62683
Signed-off-by: errea <errea@eurecom.fr>
Javier Errea [Tue, 29 Jun 2021 14:00:49 +0000 (16:00 +0200)]
Fix wrong Supported CEP protocol qualifier
TAPI nodes supported CEP qual. set based on interface
capability of the corresponding Termination Point
JIRA: TRNSPRTPCE-557
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I567cbcf537b876f47af8fe8dfcfed7911e79e3f0
Javier Errea [Tue, 29 Jun 2021 10:03:58 +0000 (12:03 +0200)]
Junit tests for new TAPI module
- TAPI convert OR to TAPI test
- TAPI topology tests + utils
- TAPI Connectivity tests + utils
- TAPI provider test
- Fix TapiConnectivityImpl and TapiContext to enable tests
- Fix ConvertFullTopo OMS link creation
JIRA: TRNSPRTPCE-563
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: Ie0796a438c26fed89997dbd2a73b979ede160517
Javier Errea [Tue, 29 Jun 2021 09:50:57 +0000 (11:50 +0200)]
Code refactoring for OR-TAPI mapping
- Nodes, NEPs, SIPs and Links have states according to OR objects
- Changed Name attribute of TAPI roadm NEPs -> testing purposes
JIRA: TRNSPRTPCE-467
Signed-off-by: errea <errea@eurecom.fr>
Change-Id: I4469e7244ed3a49b81b4dd2dac33814260eaa9a2
Guillaume Lambert [Fri, 29 Oct 2021 13:32:04 +0000 (13:32 +0000)]
Merge "Fix bug in OLM during spanloss computation"
Guillaume Lambert [Fri, 29 Oct 2021 12:23:18 +0000 (12:23 +0000)]
Merge changes I27d64e31,I9d7bba90
* changes:
Run autopep8 tox profile
Remove unused imports detected by pylint
Guillaume Lambert [Fri, 29 Oct 2021 12:21:13 +0000 (12:21 +0000)]
Merge "Bump upstream dependencies to P-SR1"
Gilles Thouenon [Wed, 27 Oct 2021 10:01:57 +0000 (12:01 +0200)]
Bump upstream dependencies to P-SR1
odlparent => 9.0.8
mdsal => 8.0.7
netconf => 2.0.7
JIRA: TRNSPRTPCE-565
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I426325d16e3e1f55b634728b686e348266a349f5
guillaume.lambert [Fri, 29 Oct 2021 07:32:59 +0000 (09:32 +0200)]
Fix functional tests 2.2.1 sequence
JIRA: TRNSPRTPCE-482
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia644743ef8fb939220f335b6c1100fef2aa11602
guillaume.lambert [Thu, 28 Oct 2021 08:50:05 +0000 (10:50 +0200)]
Run autopep8 tox profile
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I27d64e316a00de3ec21936f3427f1c63405e62da
errea [Fri, 15 Oct 2021 12:25:39 +0000 (14:25 +0200)]
Extend tapi feature documentation
- Add description of the tapi extension into the developer
guide and update tapi-topology figure
- Add comments on the Topology Management - Service Handler
interface
JIRA: TRNSPRTPCE-469
Change-Id: I229e34d64bb3548eda51f89c2f1caef3550b3251
Signed-off-by: errea <errea@eurecom.fr>
guillaume.lambert [Thu, 28 Oct 2021 07:52:14 +0000 (09:52 +0200)]
Remove unused imports detected by pylint
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9d7bba90954b0018980104943bf346e7eb1cda2d