aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-04-04Reduce Tempest multi threadsCédric Ollivier4-22/+22
It decreases the threads from 4 to 3 to allow running the testcases in parallel. Else a few tests sometimes fail. Change-Id: I268eff5a72d5de5b26d7549ac74ee0e2a05cb61e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c0e9550a76bd91322a6bb5dc4b7f9947e1794913)
2020-04-04Skip test_container_synchronizationCédric Ollivier3-1/+12
It's not supported by radosgw which is now used in Functest SUTs [1][2]. It's removed from CNTT which seems leveraging on ceph (at least RI) [3] [1] https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/3.2/html/release_notes/bug-fixes [2] http://artifacts.opnfv.org/functest/E46RCZLBRYCC/functest-opnfv-functest-smoke-hunter-tempest_slow-run-127/tempest_slow/tempest-report.html [3] http://artifacts.opnfv.org/cntt/WKFRPQODPW34/cntt-opnfv-functest-smoke-latest-tempest_slow-run-37/tempest_slow/tempest-report.html Change-Id: I8127df786c41af0d0285ef0e5cd1b28901685f65 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 461e532424648f03af61d058bedfd2191290b7cc)
2020-04-02Keep the modified tempestCédric Ollivier4-0/+4
http://artifacts.opnfv.org/functest/CRY58ZS3031L/functest-ovn-opnfv-functest-healthcheck-jerma-tempest_smoke-run-37/tempest_smoke/tempest-report.html Change-Id: I9598a45b09151fa267294716f70e65e3050f0239 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 21b512e55eb36e38160b697baae44c464fce9034)
2020-04-01Rename CNTT specific testcasesCédric Ollivier3-18/+18
Test DB and API don't support suites which raise side effects in Cachet if both IaaS verification and CNTT conformance are executed. Vmtp and Shaker haven't been modified for CNTT. They will be renamed once CNTT asks for new post processing. http://testresults.opnfv.org:8080/ Change-Id: I64e06694620027faa06b6d9d339684f5e8d733d7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c37c09b137d61d046a27973ffc44e5b32845462c)
2020-03-29Apply Accept-custom-registered-endpointsCédric Ollivier2-0/+107
This patch is needed to verify Ceph RadosGW and then has to be backported to Hunter (CNTT). Tempest maybe simply updated in a few branches (Jerma, Iruya?) depending on the side effects. Updating Tempest in Hunter would ask for an deep update of CNTT RC. https://github.com/openstack/tempest/commit/1d500e79156ada6bc6fdb628ed1da0efd4121f6a Change-Id: I5cbe6374cc5cb9d4cae92ae390f5ab63f301e4cb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-03-28Increase Shaker timeout before init message in consoleCédric Ollivier2-1/+6
It failed in parallel of rally_full [1]. [1] https://build.opnfv.org/ci/job/functest-opnfv-functest-benchmarking-hunter-shaker-run/397/console [2] https://build.opnfv.org/ci/job/functest-opnfv-functest-benchmarking-hunter-shaker-run/395/console Change-Id: I0eab7374c5962d45405c5f4147798067526f6e70 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 14268b0e9f73a057c16f1a3ea0be0246dedaf4db)
2020-03-27Check the login prompt in console in SingleVm1Cédric Ollivier3-9/+28
It also checks the second vm2 console log in case of vping_ssh. Change-Id: I13a5edfb3e19449a38d2f0478d549bd8fcc5cfa7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c4206f485163d0fd75acf98683aea1268aa1205d)
2020-03-24Remove duplicated g++ in vnf/DockerfileCédric Ollivier1-1/+1
Co-Authored-By: Juha Kosonen <juha.kosonen@nokia.com> Change-Id: I63fbeb8d2a0941d9b3492c97e14a139ba050ad7d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-03-23Doesn't redirect stderr when getting verifier idCédric Ollivier1-3/+10
The logic fails when rally produces warnings [1]. It also updates Rally OpenStack and checks if the previous error has been solved[2]. TypeError: _discover_or_create_flavor() missing 1 required positional argument: 'flv_disk' [3] [1] https://build.opnfv.org/ci/job/functest-opnfv-functest-healthcheck-latest-tempest_smoke-run/757/console [2] https://github.com/openstack/rally-openstack/commit/e62315115af20e53f6c7205494ba0008634047ed [3] https://build.opnfv.org/ci/job/functest-opnfv-functest-healthcheck-latest-tempest_smoke-run/629/console Change-Id: Ia1daaa76d7cef7f30904c1f3bd42e2f6a6ba10af Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 62f33836dfb2d24650ec7474d532e304d5d537f6)
2020-03-17Update xtesting to 0.87.0Cédric Ollivier1-1/+1
Change-Id: I0ee3499cf9c78687825714c00c1cf18ed2a70456 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 8e9706da7d6c5ab23c30fc0699fbe34e6010c6f8)
2020-03-17Remove a duplicated packageCédric Ollivier1-1/+1
Change-Id: I7f9c5b5e2c59f23ada721e7209bec56bfa23ae9e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit b732b5b53e1b46e406b8ebfcff16466e2543cd67)
2020-03-05Add oauth1 as optional Keystone featuresCédric Ollivier1-2/+3
It was not listed in Keystone which defacto sets it as optional. It may be considered as mandatory in a second step. It should be noted that it's not working in CNTT RI and there is no true plan to update CNTT RI from the time writing. Close cntt-n/CNTT#1253 Change-Id: If7ee4efeafc05638173a51ce997ecbdcaabfc79c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 13b8fd9d9f54fdac817b99f4506a1171ab0a9481)
2020-03-03Blacklist tests which are not mandatory in CNTTCédric Ollivier2-0/+49
CNTT rally_jobs must conform with CNTT RC whatever the OpenStack version under tests. All tests added by neutron since Hunter must be skipped in conformance. Of course, the IaaS verification part is unchanged as this tests are relevant. Change-Id: I4cfb4ae725e5ce9125f4ed25489dd003e16695f4 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit a0bbd644a0694bee89032f1176d9c60dd7ac7f8d)
2020-03-03Add OVN Controller Gateway agent in neutron_bind_l2_agent_typesCédric Ollivier2-6/+2
It avoids blacklisting NeutronNetworks.create_and_bind_ports in case of OVN. It conforms with the upstream testing [1] and then reverts the previous change [2]. [1] https://github.com/openstack/networking-ovn/blob/master/zuul.d/networking-ovn-jobs.yaml#L299 [2] https://git.opnfv.org/functest/commit/?id=8e297c49c481961959b29c2080cc059fcc84e9ee This reverts commit 8e297c49c481961959b29c2080cc059fcc84e9ee. Change-Id: I95f1b7146e636ae3ebe9f995733e53ad1b276d26 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 397ef4366cb3067c1a25999eab0e928937cc6e04)
2020-02-28Clean former dirsCédric Ollivier1-1/+1
Change-Id: I9d6d2ba6bfdaac26e4c7d6ea6aaf69b000869b2d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-02-24Blacklist NeutronNetworks.create_and_bind_ports if ovnCédric Ollivier1-0/+5
It only works for Linux Bridge and Open vSwitch. Change-Id: I1a437145eb8140642d3c8297c3f154113e74505f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 8e297c49c481961959b29c2080cc059fcc84e9ee)
2020-02-22Blacklist tests asking for vxlanCédric Ollivier1-0/+5
http://artifacts.opnfv.org/functest/B4HOI3WWLNVK/functest-ovn-opnfv-functest-smoke-jerma-neutron-tempest-plugin-api-run-4/neutron-tempest-plugin-api/tempest-report.html Change-Id: I6ff82b92cb4c392ac1f453faf7e16ef587dc2060 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 672a3d7f7663fd9025f1929b1e070e436ce9a965)
2020-02-22Publish tempest_conf.yaml for Functest OVN SUTCédric Ollivier1-0/+78
Change-Id: I32a93fa42fcb1993f6136a71a3f9e981e992f4b1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-02-21Update patrole regex (OVN)Cédric Ollivier1-2/+6
It takes into account last changes in Patrole. It was not covered since Apex stopped deploying OVN. Change-Id: I7ab8362f9998024ae65f49973b169b95bbfd4fb5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit e800da90b8b9b1a806f1657f67036f0ecaad19fa)
2020-02-21Skip a few tests in tempest_full and tempest_slowCédric Ollivier1-2/+5
It completes the first patch updating neutron-tempest-plugin-api [1]. The same dvr regex is used in tempest_slow, a new one is defined for tempest_full which will be added in CNTT doc (test_network_basic_ops.TestNetworkBasicOps.test_router_rescheduling). Close cntt-n/CNTT#1106 Change-Id: I9fd79c9a82bb1f84a622ccb9ea316b8e43273e2a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9ebccf93627d929fbf8738fbc9ce5ddb5f12c649)
2020-02-18Blacklick test_add_subport if OVNCédric Ollivier1-0/+1
https://bugs.launchpad.net/neutron/+bug/1863707 Change-Id: Ieebe10ee2a9040887d84aca3e8fb5ee66294634b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 7d2d6d9e9330b5535d52b88a6c864151b512ae5b)
2020-02-18Update test case list in neutron-tempest-plugin-apiCédric Ollivier1-3/+20
It takes into account latest changes in CNTT [1] [1] https://github.com/cntt-n/CNTT/pull/1107 Close cntt-n/CNTT#1106 Change-Id: I3212d1b765f7fd657ed603ed520d79fccae80bfa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit a149d2fa5b8bfcfd1dcd225c0f4bc6f4d949e420)
2020-02-16Exclude vxlan testing in CNTTCédric Ollivier1-1/+5
Close cntt-n/CNTT#1077 Change-Id: If9c0f52138e9f669f17933c42906936e2e196b2a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 6a67a88d9511226aba749cdd73a4570eab38bfeb)
2020-02-16Run test_agent_management vs OVNCédric Ollivier1-2/+0
They must not longer be blacklisted as opposed to test_dhcp_agent_scheduler [1]. https://bugs.launchpad.net/networking-ovn/+bug/1863432 Change-Id: Ib08bb87580a10e2124faa1b3853f3e27dcb3a0a0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 73d016b7c10d9c6c651dbc36556d9d727a678717)
2020-02-16Set dhcp_agent_scheduler as optionalCédric Ollivier1-3/+5
dhcp_agent_scheduler [1] indirectly forces the Neutron backends as highlighted by OVN testing. [1] https://specs.openstack.org/openstack/neutron-specs/specs/api/agent_schedulers.html Close cntt-n/CNTT#1073 Change-Id: Iafa3ad7f15dc157c0362ffa59eed31b89bf368e7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9f06dba2a6b5e4eb22652a5e17947dab612f53a4)
2020-02-16Order regex in neutron-tempest-plugin-api (CNTT)Cédric Ollivier1-5/+5
It mostly adds admin as prefix. Change-Id: Ic2e723b858ff1f3e26478f6037a19db1fd52e4aa Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit a617bcfd4e5754adcf55aa1b69cf8397ed3571cd)
2020-02-04Add Functest CNTT-specific containers in release notesCédric Ollivier1-0/+2
Change-Id: I979a5e26caee893d772de484e7a61f2e82762ace Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit bb8d191d367921beae379a78809a07c39498241c)
2020-01-26Remove Neutron from upper-constraintsCédric Ollivier1-0/+1
It takes into account the last change in Train upper-constraints.txt [1]. We could also leverage on neutron package instead but only Train is putting this constraint from the time being. [1] https://github.com/openstack/requirements/commit/1d0f6fc806ec197beee808674c57a7aa6b281e81 Change-Id: Icdbf13c2f6aa59ba48baeaf4e8f84cc041659f4f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-01-14Update ODL git commit id (python3 migration)Cédric Ollivier1-1/+1
https://jira.opendaylight.org/browse/INTTEST-65 Co-Authored-By: Alexandru Avadanii <alexandru.avadanii@enea.com> Change-Id: I40c9df7c7d80fc8d9709f0b75dda333d9ed9da12 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit be12a86a0afd2f7943377e1df94cfe00efbece07)
2020-01-09Revert "Ease overriding tempest_conf.yaml"Cédric Ollivier1-1/+0
It raises side effects if the file is missing (trying to mount a directory onto a file) which is the default case. This reverts commit 7f4dd42d8ef515b04e2436988d6b489ceb1c2995. Change-Id: I950f8654d712f4fbca3f81b3312fac014678f764 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-01-09Remove test_server_connectivity_cold_migration_revert from ComplianceCédric Ollivier1-1/+2
It's skipped due to an upstream bug [1] highlighted by Jerma runs [2]. [1] https://launchpad.net/bugs/1836595 [2] http://artifacts.opnfv.org/functest/UXR96KDNMPTP/functest-opnfv-functest-smoke-cntt-jerma-tempest_slow-run-4/tempest_slow/tempest-report.html Change-Id: Ib4cbf0e6e8e010febd39dec8dd8ecd773ad28c3e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 16a3c9c3cee0701c05168873d8bd8d4c66d0aa51)
2020-01-02Ease overriding tempest_conf.yamlCédric Ollivier1-0/+1
It works asis in Functest gates but its values mays be modified by users at their convenience. Change-Id: Id83c01693818802d11eb3822b59a508ac09990c3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit fe4c595edbaa31a43b94c5065fb14cab932ddffd)
2019-12-30Remove test_server_connectivity_cold_migration_revert from exclusion listCédric Ollivier1-2/+1
It has to be part of the Compliance testing Co-Authored-By: Deepanshu Bhatia <deepanshu@voereir.com> Change-Id: I16d35e3c3a14b6b18901b6b27e50fc709ce0559f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 4cbdef191c5c0f08043291f7c11167cd649880cc)
2019-12-27Set port_security: true in tempest_conf.yamlCédric Ollivier3-2/+9
It allows running test_boot_into_disabled_port_security_network_without_secgroup. It also sets a few default values. Change-Id: I851c5d13705e0419a7e664e05d32eec0efb417c6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9e128dcdbf26ace6790e9c0307b7e6e37763f43b)
2019-12-27Fully remove Quotas.nova_update_and_deleteCédric Ollivier1-11/+0
It was blacklisted for a while and it's still failing [1][2]. It has to be removed from scenarios (blacklisting is useless and could mislead endusers). [1] http://artifacts.opnfv.org/functest/BYERCT6UZDWT/functest-opnfv-functest-benchmarking-iruya-rally_full-run-227/rally_full/rally_full.html [2] http://artifacts.opnfv.org/functest/LYQLHFQB7CTI/functest-opnfv-functest-benchmarking-hunter-rally_full-run-329/rally_full/rally_full.html Change-Id: I9ccea90a70024b6e54d873024cf550db5beea990 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c0f66abd6d97dc3ffa707e4fb02dc41fe7337653)
2019-12-24Remove former Rally blacklistCédric Ollivier1-8/+0
Change-Id: Ibc9aa210846ad2163f7ef943d224374dfff6f1ec Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0374c91ac2d5af94d274d19ee37f995c48372cf3)
2019-12-22Fix Vmtp cloneCédric Ollivier1-2/+2
It also selects the last commit [1]. https://opendev.org/x/vmtp/commit/34a82c9f3598ec7f5d8de0a6d5139b92931db4cc Change-Id: Ie2cd33ee6b88dda4779c58c90b1692dbd7699f6b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2019-12-22Update Xtesting to 0.86Cédric Ollivier1-1/+1
It eases dumping all logs for third-parties. Change-Id: I6055e85902eb41cce01f1502cd31d7ec489708d8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 14a39e86860031bc19d114a8641a52148e1e829e)
2019-12-07Run tests sequentially in tempest_slowCédric Ollivier3-3/+3
concurrency is set to 2 in the upstream job [1] but it conflicts with serial also passed. As it fails once without any other test in parallel, the number of executors should be decreased [2]. [0] https://799189c1bf6a1aa9c8de-48970bda2a30ee836a70a12e61555969.ssl.cf1.rackcdn.com/694893/1/check/tempest-slow/1bf5851/job-output.txt [1] http://artifacts.opnfv.org/functest/functest-opnfv-functest-smoke-cntt-hunter-tempest_slow-run-7/tempest_slow/tempest-report.html Change-Id: I51bc9a584cf4b32a88b7a84d9387e7b8e90281c2 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 83c3cc3f9b71de33cd1e88c11da4879156be7cf3)
2019-12-07Disable false ansiblelint warningsCédric Ollivier2-2/+2
git commit has to be executed via shell module [1]. It also update ansible to conform with the latest changes in XtestingCI. [1] https://github.com/ansible/ansible/issues/50334 Change-Id: I3cc7a675eddabb0cbd9834a9e64fe7389a11865f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 36acd696022081c06a4d5f25ac13ea50cc5f1d2a)
2019-12-03Disable tempest serial_console testingCédric Ollivier1-1/+1
DevStack seems incorrect when configuring serial console in case of multinode deployment (missing proxyclient_address in master, missing socket in Rocky, etc). Then the testing is disabled. Change-Id: I9d1d43017b0935b23ea2a939748b5f709212c70d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 55adb2ddd6ee699c026e6f623e599f4d6cb322cb)
2019-12-02Verify Shaker results via json reportCédric Ollivier1-0/+8
As shaker always returns 0, it verifies the records and returns false after the first failure. Change-Id: I9393be0c65d315c1ca055de9f7f994f9db22eadb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 6b9e3d83030a6fe63d29bf679db93e4793700ee2)
2019-12-02Return result = 0 if failure in juju_epcCédric Ollivier1-0/+1
Else it's falsy successfull [1] [1] https://build.opnfv.org/ci/job/airship-opnfv-functest-vnf-latest-juju_epc-run/42/console Change-Id: Ic9f7c37db998904833c90ae3ee912e9908617abd Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit e03d0444b53d1a9eaeadf52f66fb69d35889d768)
2019-11-30Update Xtesting to 0.85.0Cédric Ollivier1-1/+1
It fixes falsy hrefs returned by OPNFV Test API. Change-Id: Ib6e7e7e35cf6ad581fb67692dcba561769686007 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 3b7311af247edfdc3b6aa61b56b3c2afa4722347)
2019-11-30Switch xrally_kubernetes back to masterJuha Kosonen1-1/+1
The pull request [1] is now merged. [1] https://github.com/xrally/xrally-kubernetes/pull/46 Change-Id: Ida258c279314cdbbacf255c50b3a4d1224ea803b Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2019-11-27Propose CNTT Compliance playbookCédric Ollivier3-7/+76
It eases building CI/CD toolchains everywhere veryfing the compliance between CNTT Chapter 5 API and local platforms. Change-Id: Ia5375031d5e8cafca808d52c71dde70f80e841e9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 3259d7433b8315e0d4dce668c480f1a6594a5fc6)
2019-11-27Update package list before installing in CircleCICédric Ollivier1-1/+1
It currently fails: https://app.circleci.com/jobs/github/collivier/functest/189 Change-Id: I8d3e2f468c6c44fa2b680f0370100d2bcf786601 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0ae9a065aefcb592c6a51b0004f98419d22fee0e)
2019-11-26Add tempest_scenario and tempest_slow in smoke-cnttCédric Ollivier1-0/+49
The testcases related to ipv6 are currenty not executed because they cannot be covered by our SUTs. Close cntt-n/CNTT#696 Change-Id: Ic0ca3818011bede965702e778f37752059c86173 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit a1c9756dbf867a6cfacffdecadbaf66c412c129f)
2019-11-26Add functest-benchmarking-cnttCédric Ollivier4-2/+102
It configures Rally to verify the mandatory services asked by CNTT. It also prepares the next benchmarking (API and dataplane) KPIs. Change-Id: Ie8701ddfa1a497f8b1a6f839e6ff7a77849b618c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 92460cf5330c29eb483d903f3aa659cbad1d58b8)
2019-11-26Complete tempest_full for CNTT ComplianceCédric Ollivier3-9/+38
It forbids skipping any test and counts the testcases executed. It mosly avoids running tests accoring to the upstream skip tests (known bugs), related to nova-network, glance v1, keystone v2 and all features defined as optional by CNTT. It fixes an issue highlighted by yallint. Close cntt-n/CNTT#624 Change-Id: Ib4678cb9e9fc37b16fcf21d8418931eae0f667d0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 21a0708799bd0fa61e086dc6f1c0f35c1450b55c)