Gilles Thouenon [Fri, 11 Feb 2022 11:48:48 +0000 (12:48 +0100)]
Update portmapping funct tests for otn-mpdr conf
- add new tests in portmapping functional tests for device 2.2.1 to
check the OTN device
- add specific tests in portmapping func tests and test_utils to check
configuration of the odu-switching-pool part
- speed up test execution
JIRA: TRNSPRTPCE-612
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ie171beee181de052884fe553b7b0739a215cd04d
Gilles Thouenon [Fri, 11 Feb 2022 11:38:12 +0000 (12:38 +0100)]
Fix odu-switching-pool configuration for OTN mpdr
Replace switching-pool-type "non-blocking" by "blocking" for
otn-muxponder, in honeynode configuration files, to be compliant with
OpenROADM device model white paper, section 3.2.5.2.
JIRA: TRNSPRTPCE-459
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I6185fc8eb0807143e070333419db4bf56106fb71
Balagangadhar Bathula [Tue, 22 Feb 2022 12:17:47 +0000 (12:17 +0000)]
Merge "Add 100G if-OCH-OTU-ODU4 capability"
Balagangadhar Bathula [Tue, 22 Feb 2022 12:17:05 +0000 (12:17 +0000)]
Merge "Change the ODU4 type to ODU-TTP-CTP"
Balagangadhar Bathula [Tue, 22 Feb 2022 12:16:12 +0000 (12:16 +0000)]
Merge "Bug in updating 7.1 port-mapping data"
Balagangadhar Bathula [Thu, 3 Feb 2022 23:42:59 +0000 (18:42 -0500)]
Simplify delete operations
- For all supported versions, simplify delete operations
- Keep the delete operation simple rather than
passing all the config data into the merge config
data.
JIRA: TRNSPRTPCE-620
Change-Id: I67514b2073fc91dac36d52a59b6c8d7fb401fd22
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Balagangadhar Bathula [Wed, 16 Feb 2022 21:47:06 +0000 (16:47 -0500)]
Change the ODU4 type to ODU-TTP-CTP
- Currently higher order ODU4 in 2.2.1 device is
provisioned as ODU type ODU-TTP.
- However for transponders it can be both TTP and CTP.
- Change the class to ODU-TTP-CTP.
JIRA: TRNSPRTPCE-618
Change-Id: I36eab6e361c8ba5728bc866243084b4a4a3698ec
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Balagangadhar Bathula [Wed, 16 Feb 2022 21:46:13 +0000 (16:46 -0500)]
Add 100G if-OCH-OTU-ODU4 capability
- 7.1 models 100G transponders advertise the supported
interface capapbility as if-och-otu-odu4.
- Add code to validate xponder-tp.
JIRA: TRNSPRTPCE-619
Change-Id: Iaae3089014b1d4f0a30508d96e722287a9936651
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Balagangadhar Bathula [Wed, 16 Feb 2022 21:47:57 +0000 (16:47 -0500)]
Bug in updating 7.1 port-mapping data
- Data for supporting ODUCn and OTUCn is not getting
updated after service/interface deletion
- Add code to include supporting ODUCn and OTUCn in
updateMappingInterfaces.
JIRA: TRNSPRTPCE-608
Change-Id: Iffdfc46eff28044d2d48ad94cdc069249507fa69
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Gilles Thouenon [Fri, 18 Feb 2022 09:45:54 +0000 (10:45 +0100)]
Bump upstream dependencies to P-SR2
odlparent => 9.0.13
mdsal => 8.0.11
netconf => 2.0.14
JIRA: TRNSPRTPCE-617
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ia184a77f6f11dace9b5e0fcd105a2976732e1a3a
Guillaume Lambert [Tue, 15 Feb 2022 17:19:58 +0000 (17:19 +0000)]
Merge changes I1be47b25,I0c7b0ba2,Iedfede88,Ida365311
* changes:
Add protection to PCE network analyzer PceOtnNode
Refactor PCE network analyzer PceOtnNode step 5
Refactor PCE network analyzer PceOtnNode step 4
Remove PCE net. analyzer PceOtnNodeTest useless UT
Guillaume Lambert [Tue, 15 Feb 2022 15:15:51 +0000 (15:15 +0000)]
Merge "Port-capability support in port-mapping 1.2.1"
guillaume.lambert [Mon, 14 Feb 2022 16:49:18 +0000 (17:49 +0100)]
Add protection to PCE network analyzer PceOtnNode
SERVICE_TYPE_100GE_T should not occur in PceOtnNode.
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1be47b25df672a30acc4dc9bad10ea292b756ce2
guillaume.lambert [Mon, 14 Feb 2022 10:41:45 +0000 (11:41 +0100)]
Refactor PCE network analyzer PceOtnNode step 5
There is no point to have a different treatment for SERVICE_TYPE_100GE_S
in initXndrTps() to determine the attribute 'valid'.
This specific treatment only affects the argument availableXpdrClientTps
to pass to checkSwPool() when modeType equals "intermediate".
But this parameter is not used in that case.
- refactor and merge checkSwPool() and isAzOrIntermediateAvl() methods
- use checkSwPool() directly in initXndrTps()
- remove SERVICE_TYPE_100GE_S specific treatment
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I0c7b0ba2f07fd904650a5d8ec456c326f1794c76
guillaume.lambert [Mon, 14 Feb 2022 09:23:32 +0000 (10:23 +0100)]
Refactor PCE network analyzer PceOtnNode step 4
SERVICE_TYPE_100GE_T should not occur in PceOtnNode.
- remove it from supported types
- refactor initXndrTps() and isAzOrIntermediateAvl() accordingly
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iedfede886aa6fb9f6b122a355755156ec5de0b8c
guillaume.lambert [Mon, 14 Feb 2022 08:51:29 +0000 (09:51 +0100)]
Remove PCE net. analyzer PceOtnNodeTest useless UT
Some Junit tests in PCE network analyzer PceOtnNodeTest are pointless:
-remove these useless UT
The method isPceOtnNodeValid() in PCE network analyzer PceOtnNode was
only used by these UT. There is no need to keep it now:
- remove this method that has become useless
- remove also the method isOtnServiceTypeValid() since it was only used
by the method isPceOtnNodeValid() now removed
- merge method isNotValid() into isValid() since apart these methods,
it was the only other place where it was needed
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ida3653117548ad0fbfaa77a74cf1fba184878895
guillaume.lambert [Mon, 7 Feb 2022 12:01:30 +0000 (13:01 +0100)]
Refactor PCE network analyzer PceOtnNode step 3
- make class static Maps and Lists final
- rename some variables
- rationalize conditions check & dedicated methods
- use && precendence over || to remove some useless parenthesis
- add a few intermediate functions and variables
- add a few TODO comments on remaining redundant checks code
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9fec81f36c4dd83b8000d337e84200498b960955
guillaume.lambert [Sun, 6 Feb 2022 23:13:27 +0000 (00:13 +0100)]
Refactor PCE network analyzer PceOtnNode step 2
second pass to prepare deeper refactoring of PceOtnNode class:
- use Map or List to check and manage ODU and Eth service types
instead of switch/case and if condition blocks with multiple checks
- rationalize namespaces use and import
- refactor a few checks and indentations
- point with TODO comments places where
* some missing service types might be managed
* some checks are similar to existing methods
* some new methods would help
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4ede34d4d55895303abee95365e232e97fc91de5
Balagangadhar Bathula [Sat, 12 Feb 2022 12:34:02 +0000 (12:34 +0000)]
Merge "Getter for port-capability in port-mapping 2.2.1"
Balagangadhar Bathula [Fri, 11 Feb 2022 21:13:28 +0000 (21:13 +0000)]
Merge "Remove maintenance loopback container"
guillaume.lambert [Fri, 11 Feb 2022 13:43:54 +0000 (14:43 +0100)]
Port-capability support in port-mapping 1.2.1
JIRA: TRNSPRTPCE-610
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I0ae6c9e8dc4ecdacff2f76f3bbc6791b0d1a23eb
Balagangadhar Bathula [Thu, 10 Feb 2022 07:13:10 +0000 (02:13 -0500)]
Bug in interface delete 400G-Ethernet
Fix the order of deletion for 400G Ethernet service
ODUFlex, ODUC4
JIRA: TRNSPRTPCE-614
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I15f0f12706bdaec766bbdcc0f8484c0d628787b8
Balagangadhar Bathula [Tue, 8 Feb 2022 18:58:03 +0000 (13:58 -0500)]
Getter for port-capability in port-mapping 2.2.1
- There are two ways the 2.2.1 device can advertise
supported port-capabilities
a. Using the leaf list supported-interface-capability
under ports list
b. Using port-capabilities tree.
- Currently port-mapping only supports case (a).
- Add code to provide support for case (b).
JIRA: TRNSPRTPCE-610
Change-Id: I2e6900ccafa3e50d44d59d55c97acf824c28639e
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Balagangadhar Bathula [Wed, 9 Feb 2022 21:16:52 +0000 (16:16 -0500)]
Remove maintenance loopback container
- Even with maintenance loopback set false,
NE could reject the interface creation
- Completely remove the container during the renderer
interface creation
JIRA: TRNSPRTPCE-613
Change-Id: Ibe6fc52e7b074d5d593bad3a34638d3ba83e2990
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Vachhani, Shweta (sv111y) [Fri, 14 May 2021 18:05:27 +0000 (14:05 -0400)]
Distinguish available SRG for uni/bi-direction
- Currently CP-type is assigned TXRX irrespective of unidirectional
or bidirectional. Since CP-type is used to assign respective SRG-type,
it could be misleading.
- Fix the code to have correct SRG-type.
JIRA: TRNSPRTPCE-445
Signed-off-by: Vachhani, Shweta (sv111y) <sv111y@att.com>
Change-Id: Ia0b5e82e2182d6445238e8df0a540683ad2ade7c
Gilles Thouenon [Wed, 26 Jan 2022 08:14:05 +0000 (09:14 +0100)]
Fix bug in PCE picking wrong client port
- Instead of systematically picking the first available client port
compatible with the service, pick the client port provided by the input
request parameters when specified.
- Update existing node validation to pick only endpoints with tail
- Fix a bug in otn intermediate switch functional test suite.
- Remove from tapi-connectivity impl few lines of strange code that
seems being wrong since it was replacing the client port-name specified
in the request by its associated network port-name, what was making
Ethernet service creation failing.
JIRA: TRNSPRTPCE-460
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic3f1203f62fa19db46935524200c47f74611187c
Balagangadhar Bathula [Thu, 10 Feb 2022 12:56:24 +0000 (12:56 +0000)]
Merge "Update 7.1 port-mapping data after inf delete"
Balagangadhar Bathula [Wed, 26 Jan 2022 14:07:00 +0000 (09:07 -0500)]
Update power target mask for mixed line-rate
Update power (P1 [50GHz]) for 400/100G mixed line,
according to the openROADM Optical Specifications v5.0
JIRA: TRNSPRTPCE-457
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: Ie7a6196639f3ac386772bf0d1d6d3e1382fc8bf6
Guillaume Lambert [Tue, 8 Feb 2022 17:02:53 +0000 (17:02 +0000)]
Merge changes Iee0b74c7,Ibe1f0b89,I1140eec7
* changes:
Make OpenRoadmOtnTopology class static Maps final
Improve networkmodel util OpenRoadmOtnTopology 2/2
Improve networkmodel util OpenRoadmOtnTopology 1/2
Balagangadhar Bathula [Mon, 7 Feb 2022 16:26:07 +0000 (11:26 -0500)]
Update 7.1 port-mapping data after inf delete
- When the service/interface is deleted, the 7.1
port-mapping data is not updated and still shows the
supporting ODUCn/OTUCn interfaces.
- Add code to update data for the supporting
interfaces, after deletion.
JIRA: TRNSPRTPCE-608
Change-Id: Ie0af185285f645c2d52d88699ba538bdf207a66b
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Robert Varga [Tue, 8 Feb 2022 09:41:14 +0000 (10:41 +0100)]
Do not instantiate JsonParser
Use the parseString() instead of deprecated methods.
Change-Id: I37a5cd99f0ab40c6948b4301adc140262d0b9f80
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
guillaume.lambert [Mon, 7 Feb 2022 20:58:17 +0000 (21:58 +0100)]
Make OpenRoadmOtnTopology class static Maps final
JIRA: TRNSPRTPCE-597 TRNSPRTPCE-526
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iee0b74c7ddebf861291cbea986b3288108b68109
guillaume.lambert [Fri, 4 Feb 2022 11:30:50 +0000 (12:30 +0100)]
Improve networkmodel util OpenRoadmOtnTopology 2/2
- use class Map for Service Rate / ODU type Identification
- use Long type and < or > rather than equals for bandwidth comparison
- rationalize addAugmentation and builder use
JIRA: TRNSPRTPCE-597 TRNSPRTPCE-526
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe1f0b89d63f72953e392a9cb2dffcec47c21af8
guillaume.lambert [Fri, 4 Feb 2022 10:28:03 +0000 (11:28 +0100)]
Improve networkmodel util OpenRoadmOtnTopology 1/2
- use class Map for OTU4 and OTUC4 support in some methods
- generalize ODUC3 and ODUC2 support in some methods
JIRA: TRNSPRTPCE-597 TRNSPRTPCE-526
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1140eec757df681ebb3a312be913aead061c29e5
Guillaume Lambert [Mon, 7 Feb 2022 08:35:42 +0000 (08:35 +0000)]
Merge "Portmapping for SRGs with multiple circuit packs"
Guillaume Lambert [Mon, 7 Feb 2022 08:35:18 +0000 (08:35 +0000)]
Merge changes If4c7fd58,Ib8275ddc
* changes:
Refactor PCE network analyzer PceOtnNode step 1
Refactor networkmodel util OpenRoadmOtnTopology
Balagangadhar Bathula [Fri, 4 Feb 2022 14:23:16 +0000 (14:23 +0000)]
Merge "Correct width for 200G and 300G"
Guillaume Lambert [Thu, 3 Feb 2022 14:51:59 +0000 (14:51 +0000)]
Merge "Fix gitlint tox profile"
Guillaume Lambert [Thu, 3 Feb 2022 14:30:21 +0000 (14:30 +0000)]
Merge "Unrecognized if-supported-capabilities"
Jonas Mårtensson [Tue, 1 Feb 2022 17:44:53 +0000 (18:44 +0100)]
Portmapping for SRGs with multiple circuit packs
The createPpPortMapping function was resetting the logical connection
port index to 1 for every new circuit pack in an SRG so that multiple
physical ports (cp-name/port-name) were mapped to the same logical PP
port.
Move "int portIndex = 1;" to before the loop over cicuit packs.
JIRA: TRNSPRTPCE-598
Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
Change-Id: Ifaf4353d3eca0ee76f7e46cc81084ff5110b85f3
guillaume.lambert [Thu, 3 Feb 2022 10:18:45 +0000 (11:18 +0100)]
Fix gitlint tox profile
Tox setup/ini directory is different than the one of .gitlint
configuration file that is required by pre-commit.
Use --config option in gitlint tox profile so that pre-commit
and gitlint profile can use the same configuration file.
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icfc49dae07ee21e60a2d7d7973022f87c0dcd4f2
Gilles Thouenon [Thu, 3 Feb 2022 10:07:38 +0000 (11:07 +0100)]
Fix the GNPy version used for tests to 1.2.1
JIRA: TRNSPRTPCE-571
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ic5ae9931a9e994f31aa5a617793915d85b8b5cc0
guillaume.lambert [Wed, 2 Feb 2022 22:42:55 +0000 (23:42 +0100)]
Refactor PCE network analyzer PceOtnNode step 1
first pass to prepare deeper refactoring of PceOtnNode class:
- fix a few typos
- fix most indentation issues
- remove useless parenthesis
- remove some useless intermediate variables
- remove all @Nullable decorators
the presence of side null checks made most of them pointless
- review some if/else blocks/condition layout
- review some else-if and switch/block structures (1st pass)
JIRA: TRNSPRTPCE-572
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If4c7fd58bc95d3fb9896f874df602d5f2b5ef9ee
guillaume.lambert [Wed, 2 Feb 2022 13:07:38 +0000 (14:07 +0100)]
Refactor networkmodel util OpenRoadmOtnTopology
JIRA: TRNSPRTPCE-597 TRNSPRTPCE-526
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ib8275ddcb9ee244b2fb37653f76a83940a3d3884
Balagangadhar Bathula [Wed, 2 Feb 2022 06:25:33 +0000 (01:25 -0500)]
Unrecognized if-supported-capabilities
- If device reports supported-if-capabilities that are
not present in the MappingUtils, it gives a null
pointer exception.
- Add some missing interface-identities
- Avoid adding null values to the supported-if-cap list
JIRA: TRNSPRTPCE-596
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I7cf4df57daac4b11af5229a1617eabfc60bfcfee
guillaume.lambert [Mon, 31 Jan 2022 14:37:05 +0000 (15:37 +0100)]
Migrate OTN SH renderer func. tests to RFC8040
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I3363157029a96fec421af58783446bd7f295ce81
guillaume.lambert [Mon, 31 Jan 2022 12:34:46 +0000 (13:34 +0100)]
Refactor func. tests RFC8040 service-path calls
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I47dc2aad73fbbb1f1f3afa855381c94d5d164ffb
Balagangadhar Bathula [Tue, 18 Jan 2022 06:43:24 +0000 (01:43 -0500)]
Device+OTN renderer tests 7.1 w/ intermediate rate
- add functional tests to perform device and OTN renderer service path.
- include ODUC2 (ODUC3, ODUC4), OTUC2 (OTUC3, OTUC4) and Ethernet
- even if not needed, update legacy test_utils.service_path_request
method to support modulation formats used here different from dp-qpsk
- force old draft-bierman02 RESTCONF API use in tox.ini 7.1 tests:
with RFC8040 URLs, some new tests return a HTTP code 503 (service
unavailable) instead of expected code 409 (conflict).
TODO: investigate this problem
JIRA: TRNSPRTPCE-528 TRNSPRTPCE-595
Change-Id: I56d33746f6283d5ca23199c0968ee04c15da8299
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Guillaume Lambert [Tue, 1 Feb 2022 15:54:29 +0000 (15:54 +0000)]
Merge "Fix func. tests utils base URL generation issue"
Guillaume Lambert [Tue, 1 Feb 2022 15:54:18 +0000 (15:54 +0000)]
Merge changes I6a0b6de5,I4bab4a65,I4e1c0dae
* changes:
Fix func. tests service-path calls
Migrate OTN renderer func. tests to RFC8040
Fix func. tests RFC8040 yang mount utils DS calls
Balagangadhar Bathula [Tue, 25 Jan 2022 16:51:33 +0000 (11:51 -0500)]
Correct width for 200G and 300G
Currently the width for 200G and 300G is listed as 80 GHz.
change it to 75 GHz as per the Optical Specs.
JIRA: TRNSPRTPCE-590
Change-Id: Ic8c24676b53e4e09961f9f039785fc600187a46b
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Balagangadhar Bathula [Sat, 22 Jan 2022 14:12:36 +0000 (09:12 -0500)]
Update SH and PCE to support intermediate rates
- Support OTUC3 (ODUC3) and OTUC2 (ODUC2)
- Use intermediate rate OTN-link type
- Complete end-to-end service create for intermediate rates
JIRA: TRNSPRTPCE-526
Change-Id: Ied0e52ef894ff704bc94d77875a07d8be02de89b
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
guillaume.lambert [Sat, 29 Jan 2022 13:51:23 +0000 (14:51 +0100)]
Fix func. tests service-path calls
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6a0b6de53ebab8f08b2103af7d8e618ebcadaf1c
guillaume.lambert [Fri, 28 Jan 2022 22:12:16 +0000 (23:12 +0100)]
Migrate OTN renderer func. tests to RFC8040
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4bab4a659464ed466c574961cff3a7aa86a8fa97
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 15:26:33 +0000 (16:26 +0100)]
Fix func. tests RFC8040 yang mount utils DS calls
JIRA: TRNSPRTPCE-567 TRNSPRTPCE-591
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4e1c0dae6df3adfa08cd7b5639bdc2a906eb0ad3
Gilles Thouenon [Fri, 28 Jan 2022 09:52:40 +0000 (10:52 +0100)]
Upgrade honeynode sim version
Upgrade honeynode version, for device 1.2.1, 2.2.1 and 7.1.0 to fix an
issue with equipment state update in operational datastore.
JIRA: TRNSPRTPCE-591
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I755d799aee683b480dddc117875a87b34e0e7eac
guillaume.lambert [Thu, 27 Jan 2022 20:24:27 +0000 (21:24 +0100)]
Refactor func. tests RFC8040 yang mount utils
JIRA: TRNSPRTPCE-567
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ic22d3bf47141f23a015f56ac4c5dca8b5fa2bdc7
guillaume.lambert [Thu, 27 Jan 2022 14:28:57 +0000 (15:28 +0100)]
Update GNPy functional test
- use a python package retrieved from Orange opensource GitLab repo
instead of a docker image to launch the GNPy REST server
- update test code accordingly and move it to the PCE test suite
- update tox.ini accordingly
JIRA: TRNSPRTPCE-571
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I605d2cc56c088f8213dda577d46fe4c43cbb3cfd
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