Balagangadhar Bathula [Tue, 14 Jul 2020 05:00:37 +0000 (01:00 -0400)]
Missing modulation format for 2.2.1 OCH interface
- Modified the OCH builder for 2.2.1
- Modified the test-suites
JIRA: TRNSPRTPCE-288
Change-Id: If2411fb08c358b65c6af11fdc4684daff92ac111
guillaume.lambert [Thu, 23 Jul 2020 09:40:09 +0000 (11:40 +0200)]
fix E2E 2.2.1 tox profile
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1ce393b69df07b8319af342ef1407b1066a7ae5f
Gilles Thouenon [Mon, 20 Jul 2020 11:15:56 +0000 (13:15 +0200)]
Fix otn-link update issue
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I2fa649cff963f28d9260eceaa363af2178577153
(cherry picked from commit
21caf15f44c58c876d204aa4b19aa29a27061347)
Gilles Thouenon [Wed, 22 Jul 2020 15:29:58 +0000 (17:29 +0200)]
Update kernel dependencies
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: Ieaa69027e0ff23116860c737c4a8cea1f184f47b
(cherry picked from commit
107bc0be050a750197b8137b37a16e0f3d35696b)
guillaume.lambert [Sat, 11 Jul 2020 09:01:13 +0000 (11:01 +0200)]
add a portmapping method in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I56e0208cbac615defc8ff6db7b0dc8fd9859d6f0
guillaume.lambert [Fri, 10 Jul 2020 15:27:13 +0000 (17:27 +0200)]
add a method to manage otn topo in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe9730a53912793f54480c64561644df9c965dec
guillaume.lambert [Fri, 10 Jul 2020 14:25:55 +0000 (16:25 +0200)]
add a method to manage ordm network in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: If2d568fd26772dda8abf378a10d08aae0333dd4e
guillaume.lambert [Fri, 10 Jul 2020 13:30:25 +0000 (15:30 +0200)]
add methods to manage clli network in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia7db97dd8ae93d1802ab384233deb5a7eafb4e4d
Gilles Thouenon [Fri, 10 Jul 2020 10:23:40 +0000 (12:23 +0200)]
Fix javadoc issue
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I19e5d932524209ed8b22ff2879fbff81519f4fde
Gilles Thouenon [Fri, 10 Jul 2020 15:41:02 +0000 (17:41 +0200)]
Update to Mg SR2 kernel dependencies
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I7027699dffdd21a39a747430b3b6df5bff08eb5f
Thanh Ha [Fri, 10 Jul 2020 14:11:36 +0000 (10:11 -0400)]
Do not fail on warnings for docs-linkcheck
This is a workaround due to sphinx-tabs being incompatible with the
Sphinx linkchecker which throws a warning. We mainly use linkchecker
to catch broken links so we don't really need to fail on warnings as
the main "docs" builder will still fail for warning level issues so
this is a reasonable workaround.
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I545f7cfaea27f907c13b5c21af26f1ee4b7d1b62
guillaume.lambert [Thu, 9 Jul 2020 21:40:12 +0000 (23:40 +0200)]
activate otn E2E tests in releng
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I86784e91893551c699af11618aa6b3637f6ae953
Gilles Thouenon [Wed, 8 Jul 2020 15:59:15 +0000 (17:59 +0200)]
Functional tests for end-to-end otn services
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I10f3ac24a4a13bd6426afb9f0c396fe806a06464
guillaume.lambert [Thu, 9 Jul 2020 13:52:05 +0000 (15:52 +0200)]
add methods to manage ordm topo in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2b46cf62b3a37e25a20f3e559af224f78db52e1e
guillaume.lambert [Thu, 9 Jul 2020 20:24:07 +0000 (22:24 +0200)]
force releng tox docs-linkcheck to success
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I47dad72c244c5ed54d8aa8d2941d9a8e06316323
Guillaume Lambert [Thu, 9 Jul 2020 20:32:57 +0000 (20:32 +0000)]
Merge "Fix service-name in otn-renderer FuncTest"
Gilles Thouenon [Tue, 7 Jul 2020 13:03:10 +0000 (15:03 +0200)]
Simplify spdrA configuration management in tests
Keep only one configuration (without existing interfaces) for SPDRA,
given the fact that interfaces may now be easily created by
TransportPCE.
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I65ba30a1f960f6ad9400a2ac925af69795b0ceba
Guillaume Lambert [Thu, 9 Jul 2020 09:23:47 +0000 (09:23 +0000)]
Merge changes I1ed16552,Ia080da84
* changes:
add a method to get nodes oper DS in func tests
add a method to check nodes configs in func tests
guillaume.lambert [Wed, 8 Jul 2020 13:06:42 +0000 (15:06 +0200)]
add a method to get nodes oper DS in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1ed16552d2941fc75f78a8fc85a6cc9763554e04
guillaume.lambert [Tue, 7 Jul 2020 15:09:11 +0000 (17:09 +0200)]
add a method to check nodes configs in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia080da8480363c2387ffd0828eb3c9ed3583d64f
Gilles Thouenon [Tue, 7 Jul 2020 08:58:21 +0000 (10:58 +0200)]
Fix service-name in otn-renderer FuncTest
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I31b447faf8153619dea383aa7ca72f092927be57
Gilles Thouenon [Thu, 2 Jul 2020 06:55:17 +0000 (08:55 +0200)]
Integration of end-to-end otn services
-allow creation and deletion of new WDM service (OCH-OTU4) and OTN
services (HO-ODU4, 10GE/1GE) from Service Handler
-complements changes 87920 and 90616 with deletion of otn services
-for 10GE and 1GE services, use trib-port and trib-slot numbers provided
by PCE computation
-for service deletion, retreive and introduce the service header
description in order to distinguish the type of otn service to delete
and adapt its deletion consequently
-adapt Junit tests consequently
JIRA: TRNSPRTPCE-165, TRNSPRTPCE-194
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I83da87a0c61eb32c9ab023ad614adc79caa3ed75
Gilles Thouenon [Thu, 2 Jul 2020 06:51:40 +0000 (08:51 +0200)]
Adapt PCE output to include trib-port & trib-slot
JIRA: TRNSPRTPCE-164
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I170e12e07f16a0f7b0e7a61d79e976b78e64e705
Gilles Thouenon [Mon, 29 Jun 2020 09:11:07 +0000 (11:11 +0200)]
Upgrade path-description model to 1.6.1 for otn
- remove mandatory attribute for wavelength number (useful only for
OCH-OTU4 services)
- add trib-port and trib-slot number attributes for otn low order
services
JIRA: TRNSPRTPCE-164
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I495ebacc5341b0cb3067f74e1c5e8f65602cf93a
Balagangadhar Bathula [Fri, 12 Jun 2020 22:33:04 +0000 (00:33 +0200)]
adapt functional tests to SH-Renderer new OTN API
- New tests for validating WDM/OTN service
- Renderer service implementation tests
- update docker source profile
TODO:
- Tests for service delete (depends on OTN tpce?)
JIRA: TRNSPRTPCE-194
Change-Id: I88b6961f2e4bf7732358d420576cbf29dff8b402
guillaume.lambert [Mon, 29 Jun 2020 08:48:08 +0000 (10:48 +0200)]
do not start tests if sample files cannot be read
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4f28b20004ff34f951afcde0d14b845301cc2dce
guillaume.lambert [Mon, 29 Jun 2020 08:02:30 +0000 (10:02 +0200)]
enable OTN topology func test in releng
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5c275f1f45a759bf5c1250afaae5914bb8654a0b
guillaume.lambert [Fri, 26 Jun 2020 19:18:36 +0000 (21:18 +0200)]
generalize RESTconf requests methods in func tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifc2f5644e3c4d9601bb8f59a81ca6cbed78e7284
guillaume.lambert [Sat, 27 Jun 2020 10:03:27 +0000 (12:03 +0200)]
review SPDR sims nomenclature
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I597e787bf9d9dc835ae0a7d46d16563774f5efb3
guillaume.lambert [Fri, 26 Jun 2020 11:47:51 +0000 (13:47 +0200)]
fix networkmodel tests portMapping.json
- for hash values based on FNV
Co-authored-by: Balagangadhar Bathula <bb4341@att.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I112d3f11eee0f5bb273bf8089673272d0f9ac089
guillaume.lambert [Fri, 26 Jun 2020 17:42:03 +0000 (19:42 +0200)]
fix some tapi functional tests issues
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie1ad96c87cd25e1739f1408d1fd540791908c2b3
guillaume.lambert [Fri, 26 Jun 2020 11:38:09 +0000 (13:38 +0200)]
reactivate E2E tests vote in jenkins
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I0dbf2459a81b2822a52d02a062470d1d1e412007
guillaume.lambert [Thu, 25 Jun 2020 22:49:06 +0000 (00:49 +0200)]
disable failfast in rspn tests
Otherwise, devices are not cleanly unmounted in case of tests failure
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I550d33f5bce832113ae699b310d3916507b55f3a
guillaume.lambert [Thu, 25 Jun 2020 23:12:03 +0000 (01:12 +0200)]
replace 'tail -F' by python portable code in tests
- wait for log file creation if needed
- use classical open/fseek/readlines/close built-in file handlers
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Id7d9e61f6ebdadde2d9de585f049f436df38f931
Balagangadhar Bathula [Wed, 19 Feb 2020 22:04:55 +0000 (17:04 -0500)]
SH-Renderer API code to handle OTN Step 2
- improve ODU4 support
- Fixing connection-type issue for roadmline
JIRA: TRNSPRTPCE-194
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I78afa16ed4706b1e5f74eeec5259d56e58eae181
guillaume.lambert [Thu, 25 Jun 2020 21:33:35 +0000 (23:33 +0200)]
clean common/pom.xml
to unforce Junit tests execution
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I6d565a6ddc5a3a982b81521ae20df50e564747d0
Guillaume Lambert [Wed, 24 Jun 2020 18:06:31 +0000 (18:06 +0000)]
Merge "some tests for PortMappingVersion121"
Guillaume Lambert [Wed, 24 Jun 2020 16:31:31 +0000 (16:31 +0000)]
Merge "Some tests for transportpce-common"
Guillaume Lambert [Wed, 24 Jun 2020 15:25:20 +0000 (15:25 +0000)]
Merge "improve pce unit tests"
Abdelmuhaimen Seaudi [Tue, 9 Jun 2020 20:48:27 +0000 (22:48 +0200)]
some tests for PortMappingVersion121
JIRA: TRNSPRTPCE-276
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I9d071fbfd1495942f7234908b998df87ce483c3a
Abdelmuhaimen Seaudi [Fri, 5 Jun 2020 15:43:49 +0000 (17:43 +0200)]
Some tests for transportpce-common
add test-common dependancy in pom.xml file
JIRA: TRNSPRTPCE-276
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I0534886a9aae432a3e8ee6d7d56779bf4f686a32
AhmedEldeeb50 [Wed, 10 Jun 2020 08:20:43 +0000 (10:20 +0200)]
improve pce unit tests
-add some helper methods at NetworkTransactionUtil
-add try with resource for IO
-add a message to assert(True/False)
JIRA: TRNSPRTPCE-209
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: I721b6c3bf472a299cd3016929d4af2e99bd6bb5e
Abdelmuhaimen Seaudi [Sat, 30 May 2020 22:06:18 +0000 (15:06 -0700)]
Add NetConfTopologyListenerTest
JIRA: TRNSPRTPCE-270
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I142a58243b7f58f4f7d19fe664f841a11a9189ad
guillaume.lambert [Wed, 24 Jun 2020 13:35:56 +0000 (15:35 +0200)]
review tox.ini E2E tests sequence
- pull all end-to-end 1.2.1 or 2.2.1 tests at the end
- make them non-voting
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9b38b78995261ebe82f9ca9bc2390465c602de03
Balagangadhar Bathula [Wed, 19 Feb 2020 22:04:55 +0000 (17:04 -0500)]
SH-Renderer API code to handle OTN Step 1
- Added otn-service-path method in SH model-mapping
- Updated renderer to differenciate WDM and OTN service.
- Updated service-path-path with connection type.
- Updated the ODU4/OTU4 renderer input create
- Fixed unit tests
JIRA: TRNSPRTPCE-194
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I177fd453e9e0862bba6ff0bc9669ba719679cf54
Balagangadhar Bathula [Fri, 12 Jun 2020 21:01:22 +0000 (23:01 +0200)]
upgrade transportpce-renderer YANG to 1.6.1
- to add a leaf connection-type that improves the OTN support
- and modify import statements accordingly
JIRA: TRNSPRTPCE-194
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1cdd432b92fb77ef8582f67aeb1af4019c0f3c74
guillaume.lambert [Tue, 23 Jun 2020 14:14:31 +0000 (16:14 +0200)]
replace portmapping FNV1-128 by FNV1-64 + Base64
FNV1 128bit hash produces 16 bytes results but they cannot easily be
represented as a UTF-8 readable string of 16 characters as required
by SAPI/DAPI OpenROADM specification.
Base64 conversion allows to fix this but generates an overhead.
By using FNV1 64bit hash + Base64, we can guarantee the results
will not exceed 16 characters (usually around 13).
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I559b5439f83cffc619a1db4e29b9d78c8401ed06
guillaume.lambert [Tue, 23 Jun 2020 20:01:03 +0000 (22:01 +0200)]
fix Lighty build
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8dc29dfcc2de285b48ee853f43f3c0525ea56a8f
guillaume.lambert [Tue, 23 Jun 2020 07:41:56 +0000 (09:41 +0200)]
reactivate E2E functional tests in the gate
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I4a624a698ce1acb9b6b29fbec5758d32a0af0513
guillaume.lambert [Mon, 22 Jun 2020 22:55:11 +0000 (00:55 +0200)]
fix some pylint issues
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I88f3d068d8199610556e18faaaf850a2f97ebf32
guillaume.lambert [Mon, 22 Jun 2020 08:22:23 +0000 (10:22 +0200)]
improve devices connection methods in tests
- improve log parser output
- move some constants to common/test_utils:
- RESTconf base URL
- ODL and nodes credentials
- json and XML application-type headers
- improve functions to mount or unmount devices onto ODL
- centralize them in common/test_utils to use the same ones in all tests
and speed up tests by removing some timers
TODO in next other changes:
- use test_utils get/post/del/put_requests methods in all tests
- replace the other timers with the log parser
- find an alternative to calling 'tail -f' host command
- address pylint issues
Change-Id: I2b97700e363a3773dcc1606448eedae57c8c6696
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Thu, 18 Jun 2020 10:43:04 +0000 (12:43 +0200)]
Align 1.2.1 tests sims/tpce management to 2.2.1
- move 2.2.1 test_utils.py to a common folder
to make it resuable in 1.2.1 tests
- create 2 simulators.py files with version specific parameters
to import them in test_utils
- use symlinks to by pass python relative import beyond top-level issues
- adapt functional tests code accordingly
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I81351ecc33a32bd7149bc9d16c4a8fa53bd4938c
guillaume.lambert [Wed, 17 Jun 2020 22:07:51 +0000 (00:07 +0200)]
review sims/tpce process management in 2.2.1 tests
Change-Id: I441312ada9b10f498d86fcb1fd6fda0aa0be4d3f
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
guillaume.lambert [Fri, 19 Jun 2020 14:56:48 +0000 (16:56 +0200)]
fix topology files relative paths in PCE functest
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I2e46402a1200129f68009994b37d59eadfb39a89
Balagangadhar Bathula [Sun, 14 Jun 2020 02:58:07 +0000 (22:58 -0400)]
minor changes in functional tests
- Tox is added with env variables for network proxy setting
- Changed the default timeout value in test_utils.py 221
- fix tox.ini BSD sed
- comment this solution with the details of the backslash hell
generated by tox
Change-Id: Ib6c4da9dac80705344038d199a7372795461a6dc
Guillaume Lambert [Sat, 20 Jun 2020 10:46:10 +0000 (10:46 +0000)]
Merge "review sims/tpce start-up sequence in 2.2.1 tests"
Guillaume Lambert [Sat, 20 Jun 2020 10:45:46 +0000 (10:45 +0000)]
Merge "rationalize functional tests sims starters"
manuedelf [Fri, 19 Jun 2020 20:23:44 +0000 (22:23 +0200)]
Update honeynode simulator version
New version following bux fix "Make honeycomb-tpce script BSD compatible"
Change-Id: If259f0d24924b86a55da0aeb655ce6b13ffb0685
ShaabanEltanany [Sun, 31 May 2020 10:56:32 +0000 (12:56 +0200)]
add unit tests for pceOtnNode
JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I84db3039341163441d3bf05cf0741e3efb32a9e1
Balagangadhar Bathula [Wed, 10 Jun 2020 14:57:43 +0000 (10:57 -0400)]
Catch port-mapping failing
When the xponder subtree has missing circuit-packs/ports,
skip those missing circuit-packs/ports and continue port-mapping.
Change-Id: I33e53c9b9d5981564986593d87fa1532d5b06edb
shweta [Mon, 15 Jun 2020 19:09:32 +0000 (15:09 -0400)]
Power Control for Flex-grid
1) Updated olm-renderer-input to have central-freq and width
2) Changed revision for transportpce-common-types
3) Added PSD power calculation in PowerMgmtImpl
TRNSPRTPCE-254
Signed-off-by: shweta <sv111y@att.com>
Change-Id: I7f0ace1e0d88e9840a401108e15787d8e8d81942
Guillaume Lambert [Thu, 18 Jun 2020 15:05:27 +0000 (15:05 +0000)]
Merge "fix assertDictContainsSubset deprecation warnings"
ShaabanEltanany [Tue, 2 Jun 2020 04:47:13 +0000 (06:47 +0200)]
adding some unit tests for PceServiceRPCImpl
JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I2bfab3053f865191e9e03b588666669e7b08f821
manuedelf [Wed, 17 Jun 2020 17:47:39 +0000 (19:47 +0200)]
Update honeynode simulator version
New version following bug fix when deleting interface for 2.2.1 devices.
Change-Id: Ib843b4092a0bdcb9f55544c1b719c522833d0d0e
guillaume.lambert [Wed, 17 Jun 2020 09:32:12 +0000 (11:32 +0200)]
review sims/tpce start-up sequence in 2.2.1 tests
and make tests fail immediately when tpce does not start correctly
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I472a132873e0180a1900642c412d8bfef71ab72e
guillaume.lambert [Mon, 15 Jun 2020 11:05:16 +0000 (13:05 +0200)]
rationalize functional tests sims starters
in test_utils.py:
- centralize sims ports and config/log files in one associative array
- based on this, use one method start_sim(sim) for every sims
- remove obsolete dedicated-per-sim methods
- centralize messages printed at sims and tpce start-up
in tests files
- replace harcoded port values by the corresponding array value
- replace the term "honeynode" by "sim" which is more generic
- remove obsolete sims timers in 2.2.1 tests
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I99c29be7cfcccbce28748cf79ddcf40d148641ef
guillaume.lambert [Tue, 16 Jun 2020 07:56:08 +0000 (09:56 +0200)]
fix assertDictContainsSubset deprecation warnings
that appeared in functional tests with python 3.2
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I5d7c32c2af5adf47c8216ac537302c39f92eae12
Gilles Thouenon [Sat, 13 Jun 2020 14:24:02 +0000 (16:24 +0200)]
UUID stabilization in TAPI Topology abstraction
- make UUID generation deterministics instead of being randomly generated
- update existing JUnit tests taking into acount this evolution
- add new JUnit test to validate the TAPI abstraction for OTN topology
TRNSPRTPCE-186
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: Ia8541282799c10c5de0ad4bb263eb33ec6eb87a1
Guillaume Lambert [Fri, 12 Jun 2020 14:25:28 +0000 (14:25 +0000)]
Merge "Improve OpenRoadmOtnTopology and add Junit tests"
Gilles Thouenon [Fri, 5 Jun 2020 10:28:11 +0000 (12:28 +0200)]
Improve OpenRoadmOtnTopology and add Junit tests
JIRA: TRNSPRTPCE-270
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: I6c1347daa149adce1130c9ccf01b05d7e874ff14
Guillaume Lambert [Thu, 11 Jun 2020 15:04:59 +0000 (15:04 +0000)]
Merge "Lighty refactor"
manuedelf [Wed, 10 Jun 2020 14:25:49 +0000 (16:25 +0200)]
Lighty refactor
- clean pom
- add unit test
- add TpceBanner class to print banner
- add possibility to pass a config file for restconf at startup
- add technicalException to exit application if startup failed
- split TransportPCEImpl constructor
- add checkstyle from odl parent
- fix checkstyle violations
JIRA: TRNSPRTPCE-237
Change-Id: I3956d83ab6f0dfafa57e26058d275c4448a8c95c
manuedelf [Fri, 5 Jun 2020 12:20:15 +0000 (14:20 +0200)]
Update honeynode simulator version
Support interleave capability
Change-Id: Ia796e4637a6f32c9374d259833368bfcf45c15aa
guillaume.lambert [Wed, 10 Jun 2020 11:34:54 +0000 (13:34 +0200)]
run autopep8 on functional tests suite
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I84e213e4e8cc3ea623eafe08f9b3a1a3c3d1b861
manuedelf [Tue, 9 Jun 2020 09:28:38 +0000 (11:28 +0200)]
T-API support in Lighty
- add T-API provider to lighty.
- add Lighty support to tapi221 functional test
JIRA: TRNSPRTPCE-237
Change-Id: I9d3520ad89c2d94535b213aee92f1fb414609226
Guillaume Lambert [Wed, 10 Jun 2020 07:56:12 +0000 (07:56 +0000)]
Merge changes from topic "fix-tapi"
* changes:
Tapi functional tests
improve functional tests
manuedelf [Tue, 2 Jun 2020 22:19:44 +0000 (00:19 +0200)]
Tapi functional tests
- Add functional test for tapi
- Update tox.ini with the functional test for tapi
JIRA: TRNSPRTPCE-273
Change-Id: I570f4a67dbed511f7ba245d1035feef7110138c9
manuedelf [Thu, 4 Jun 2020 09:29:18 +0000 (11:29 +0200)]
improve functional tests
- Refactor test_util 2.2.1 to remove duplicated code
- improve sed command in tox.ini to patch Karaf exec
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: Ieccc45df64b038e910ea1d2b7ff44fdcbcfcb301
Jonas Mårtensson [Sun, 31 May 2020 18:39:11 +0000 (20:39 +0200)]
Measure and set spanloss with one fractional digit
Currently spanloss is measured and set without any fractional digits.
This patch proposes to use one fractional digit for more precise
calculation of target power value.
Unit tests and functional tests have been updated with the more precise
spanloss and power values.
Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
Change-Id: I7b7aba070f7ecf7894c89de9807b686f75eecfeb
Jonas Mårtensson [Sun, 31 May 2020 18:02:09 +0000 (20:02 +0200)]
Avoid converting spanloss to double when calculating target power value
Currently spanloss is measured and set without any fractional digits.
We would like to have one fractional digit but this creates problems
because of the conversion to double when calculating target power
resulting in the power value having more than the two fractional digits
allowed by the yang module. This patch proposes to skip the conversion
to double and only use BigDecimal to avoid the problem.
The proposal to measure spanloss with one fractional digit will be
submitted in a separate patch.
Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
Change-Id: Ibd13c991d43f2e94739710412e8edadcc0c537bf
Gilles Thouenon [Mon, 8 Jun 2020 10:09:31 +0000 (12:09 +0200)]
Fix bug in PceOtnNode
Allow path computation for otn lo-services
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
Change-Id: If8b450bfaa1225090de1c2ab068f5f538b857bec
manuedelf [Mon, 8 Jun 2020 15:15:46 +0000 (17:15 +0200)]
Lighty support in Magnesium
- use release version of lighty-app-parent
- set groupId to io.lighty.controller
- set artifactId to tpce
- fix final jar name to tpce
- update shell scripts
- remove unused dependencies from pom
- add missing ietf.restconf.rev131019 yang model to fix serialization problem
JIRA: TRNSPRTPCE-237
Change-Id: I45f243091ad1ec723475350d04b373cf8580cb84
manuedelf [Thu, 4 Jun 2020 08:33:58 +0000 (10:33 +0200)]
Fix TAPI Sonar issues
JIRA: TRNSPRTPCE-215
Change-Id: I7ce7da54928748392ecb68877a8159cddbd40b4b
Guillaume Lambert [Mon, 8 Jun 2020 07:27:43 +0000 (09:27 +0200)]
bump dependencies to Mg SR2 dev versions
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: Idb611d59cd03eb328a484622b14f9c5b17d1f8c6
Thanh Ha [Fri, 5 Jun 2020 18:24:18 +0000 (14:24 -0400)]
Remove repositories section from pom
It is not good Maven practice to hardcode repositories sections into
pom.xml and our check-poms job has been failing due to this for some
time.
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: Ia15e9e741e5ea2dfca32c43bdf10ac59786abc7e
Gilles Thouenon [Thu, 4 Jun 2020 08:15:22 +0000 (10:15 +0200)]
Junit tests for network model
Add new Junit unitary tests for package
org.opendaylight.transportpce.networkmodel.util
JIRA: TRNSPRTPCE-270
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Emmanuelle Delfour <emmanuelle.delfour@gmail.com>
Change-Id: Ia93aa3b37bc5a2df8981e862ebffd164bcd5d852
manuedelf [Tue, 2 Jun 2020 22:11:07 +0000 (00:11 +0200)]
Fix tapi execution
- Fix NPE in TapiTopologyImpl
- Fix Junit for TapiTopoogyImpl
JIRA: TRNSPRTPCE-275
Change-Id: Ia2323068a5d39ca91fcbd05d19659a6f748e0759
manuedelf [Wed, 27 May 2020 18:48:12 +0000 (20:48 +0200)]
GNPy stub for PCE
Add GNPy stub to simulate GNPy API
Add class util to deserialize file content to GNPy Yang object
Add example how to use GNPy stub
Add JSON files for openroadm-network
Add JSON file for opendroadm-topology
Add JSON file for GNPy result
Add JSON file for GNPY request
Add simplelogger.properties file for unit tests log
JIRA: TRNSPRTPCE-209
Change-Id: Id2ea6ba918636a35b99cad2acc6176115d3dbe2b
atriki [Tue, 2 Jun 2020 13:04:27 +0000 (15:04 +0200)]
PCE func tests to consider oms-attributes absence
- Compute a path in complex_topo_uni_dir_data from Xponder2-2 to Xponder-1-2
- Check that the path goes through the link
OpenRoadm-1-3-DEG2-to-OpenRoadm-1-2-DEG2
- Delete the oms-attributes of OpenRoadm-1-3-DEG2-to-OpenRoadm-1-2-DEG2
- Compute a new path between the same source/destination nodes as the first
- Check that the new path does not go through the link
OpenRoadm-1-3-DEG2-to-OpenRoadm-1-2-DEG2
JIRA: TRNSPRTPCE-69
Change-Id: Icc6fe79fc0bc4f0cc47c6230f461894576529744
Signed-off-by: atriki <ahmed.triki.tn@gmail.com>
manuedelf [Tue, 2 Jun 2020 22:25:24 +0000 (00:25 +0200)]
Update .gitignore
Ignore directory generated by junit on pce
Change-Id: Iccf9f92f6ed24fdc3d86d7cc48b88ddc3eb59a78
manuedelf [Tue, 2 Jun 2020 21:31:24 +0000 (23:31 +0200)]
Fix tapi feature installation
Since change #88138 tapi feature installation result has OK status
but TapiTopologyImpl init method was not called du to wrong
blueprint file directory path
- Fix tapi blueprint configuration file directory path
JIRA: TRNSPRTPCE-275
Change-Id: I024045266e08018e72adc698dabe890ef354f0bd
guillaume.lambert [Wed, 6 May 2020 10:41:13 +0000 (12:41 +0200)]
Enforce SpotBugs in Service handler
and fix ServiceHandler SLF4J SpotBugs issues.
By the way:
- rename ServiceHandlerCompliancyCheck class for coherence
- clean ModelMappingUtils.java and ServicehandlerImpl.java
- review how messages and logs are handled
- improve Junit tests
JIRA: TRNSPRTPCE-214 TRNSPRTPCE-246 TRNSPRTPCE-265
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I82e1ac784bb66acbdcf62004da6da6eb3701434b
AhmedEldeeb50 [Wed, 27 May 2020 16:28:09 +0000 (18:28 +0200)]
added test cases for graph with OTN
JIRA: TRNSPRTPCE-209
Signed-off-by: AhmedEldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: Id8265333706462e4f8943f8db3e3fecedd1038ab
Guillaume Lambert [Thu, 28 May 2020 13:45:02 +0000 (15:45 +0200)]
update wiki URL once more
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: Ia157634f4535bace003f08d91695003816de7dcb
manuedelf [Tue, 19 May 2020 14:13:21 +0000 (16:13 +0200)]
Update Dockerfile
Following removing honeynode source code from
transportpce, Dockerfile must be updated.
JIRA: TRNSPRTPCE-238
Change-Id: Idb5122a865c772e695be33bb0127f90f19360e50
ShaabanEltanany [Thu, 21 May 2020 20:52:26 +0000 (22:52 +0200)]
add some unit tests and refactor isPceOtnNodeValid
JIRA: TRNSPRTPCE-209
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: Ifbe167a1148d592e7719a4c1f8061f01b1d6ab38
guillaume.lambert [Tue, 5 May 2020 14:18:04 +0000 (16:18 +0200)]
Enforce SpotBugs in inventory build process
by annotating remaining warnings with a @SuppressFBwarnings decorator
JIRA: TRNSPRTPCE-207 TRNSPRTPCE-241 TRNSPRTPCE-265 TRNSPRTPCE-272
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Iabd129118abf6c47f97bd63e83363c462f776456
guillaume.lambert [Tue, 5 May 2020 13:19:19 +0000 (15:19 +0200)]
fix some inventory issues
SpotBugs issues
- Huge string constants duplicated across multiple class files
- unused local variables
Checkstyle issue
- 120 characters line length enforced in queries strings
JIRA: TRNSPRTPCE-207 TRNSPRTPCE-241 TRNSPRTPCE-265
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8b4971f503897df566eb833fb01b8693e451dc68
guillaume.lambert [Mon, 4 May 2020 11:40:44 +0000 (13:40 +0200)]
remove inventory uncalled private methods
JIRA: TRNSPRTPCE-207 TRNSPRTPCE-241 TRNSPRTPCE-265
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I34350349487befbfefb408dd4bf9c0b7aa1507dc
guillaume.lambert [Thu, 7 May 2020 16:01:17 +0000 (18:01 +0200)]
Enforce Spotbugs in tapi module
by fixing remaining SpotBugs issues
JIRA: TRNSPRTPCE-215 TRNSPRTPCE-247 TRNSPRTPCE-265
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I9ca19f61747c77d2431783dab82cc63935917400