aboutsummaryrefslogtreecommitdiffstats
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2020-05-03Stop overriding tempest_conf.yaml in CNTTCédric Ollivier2-92/+0
It's useless as they are skipped by regexes (vnc_console). Change-Id: If3cea451c95179e7e200708e1f3b5e9534be9e1d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9141dcbb5af4b0d49e2cbb1aa55e55105529bd01)
2020-05-01Exclude tests.scenario.test_octavia_lbaas in CNTT regexesCédric Ollivier1-0/+1
It may be skipped as well (the behavior differs if it's enabled or not via config). Change-Id: Ic23119001b7478e466782a58d8757117bf16e5c3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 80fd73edacd47df07b55597ff5b2c7e6d017d5b9)
2020-05-01Rename barbican->tempest_barbicanCédric Ollivier1-1/+1
Change-Id: Ia62394795db3555fba56a7a333d9f0db226cedbe Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-05-01Remove neutron_trunkCédric Ollivier1-18/+0
It was merged in neutron-tempest-plugin. Change-Id: I87ca29154f727021c007a386badcadc9f3858506 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c31996fccb822a8839857590f4fcd23a8511b279)
2020-04-30Skip LoadBalancerTest in Functest GatesCédric Ollivier1-1/+2
It seems failing due to octavia noop driver as in-used. Change-Id: I53e1fe1cfe4930f92c1a4460e89ed6e21eb3f922 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d9d55730138d0a9bc27dee2cc2ec694478191c8b)
2020-04-28Select tag instead of commit idCédric Ollivier1-1/+1
Change-Id: I7da5b383c3c724f4616c54a21ba9c746f146f18f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit fb67fc715ac4dace0c1b217a683847fa54cad135)
2020-04-28Rename neutron_tempest_plugin_api to tempest_neutronCédric Ollivier2-2/+2
It conforms with the other test case names Change-Id: Ia8836375c26ea4f1bff3637f7078e5f70f83c5fb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f74088bb1ae93feaf56c7ec7d1f1e78c97d8de9a)
2020-04-28Complete "Skip CfnInitIntegrationTest in tempest_heat"Cédric Ollivier1-1/+2
http://artifacts.opnfv.org/functest/SXA8X2BBP3L4/functest-opnfv-functest-smoke-cntt-latest-tempest_heat_cntt-run-1/tempest_heat_cntt/tempest-report.html Change-Id: Ie26d561fbb490bcaafe7c8ffddebc28bd72ff51c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit ec014dd2d4567079d854cc0f97f3dbc0bd345ca5)
2020-04-28Move static data to tempest_conf.yamlCédric Ollivier1-0/+1
Change-Id: I99f33f2e5f27c22c597f7c4f2f864710ceb1350e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 7e53a395dca4670e4e211c6b37bf259f43098b96)
2020-04-28Skip CfnInitIntegrationTest in tempest_heatCédric Ollivier1-0/+6
It sometimes fails due to other test resources [1]. [1] http://artifacts.opnfv.org/functest/83IV2XRCU05K/functest-opnfv-functest-smoke-latest-tempest_heat-run-53/tempest_heat/tempest-report.html Change-Id: Ied91781c784370b424653e37c090a909f16b6585 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f1c7b8055728705988394368926edaa2627eb6d2)
2020-04-27Add tempest_heat in CNTT smokeCédric Ollivier1-0/+24
It increases Heat coverage [1]. [1] http://artifacts.opnfv.org/functest/24ELW4C5RKD4/functest-ovn-opnfv-functest-smoke-latest-tempest_heat-run-34/tempest_heat/tempest-report.html Change-Id: I6630e4827a59b2ded34e5c271b9155df3b25f588 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d2bcbbf9dc9f1edc1e08e2add252618a08c4f07c)
2020-04-25Use ujson version asked by OpenStack requirementCédric Ollivier5-3/+7
It's newer than the former tag selected [1]. [1] https://github.com/openstack/requirements/blob/master/upper-constraints.txt Change-Id: Ie89136da364d7e972a1d7f49c71bdfbbdd9671d8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 743235f280b675cab39adb15de8bcea215a1c038)
2020-04-19Run sequentially tempest_heatCédric Ollivier1-1/+1
It's forced by design else it remains a few resources. It also sets fixed_subnet_name and network_for_ssh to avoid falsy discovery as it seems [1] [1] http://artifacts.opnfv.org/functest/X5GDYF3B0R2B/functest-opnfv-functest-smoke-jerma-tempest_heat-run-18/tempest_heat/tempest-report.html Change-Id: Ieb584ddc1c0b4ebb543e9d69277a20aaee0fbac0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c2e3d911d9eaf987d18b3b895778c411e62efc4a)
2020-04-14Backport Fixes-race-condition-in-test_add_remove_fixed_ipCédric Ollivier2-1/+169
It has sometimes failed in gates and Orange reported the issue. Backporting is the best approach as for swift testing. Change-Id: I7c66faf77cdee3f52a2299d64dc4140de22f4cad Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit ab26ce1cc28c590115ac07ea4a51b9f75f902c9a) (cherry picked from commit a710d74306c0a49c19c63676e0aab2f4e093aa26)
2020-04-11Remove false "apk del .build-deps"Cédric Ollivier1-2/+1
https://build.opnfv.org/ci/job/functest-healthcheck-docker-build-amd64-hunter/307/console Change-Id: If0eb7500e2343a3e4e7ab1ea9ba9552bd929a101 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-04-11Add OVN tempest_conf.yamlCédric Ollivier1-2/+2
Change-Id: Iaabe4de2c2b631f0ba823dda2d0e0a172aa04622 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-04-11Add healthcheck Horizon testsCédric Ollivier2-3/+25
It runs TestDashboardBasicOps as proposed by tempest-horizon [1]. It's skipped if DASHBOARD_URL is unset (default). [1] https://opendev.org/openstack/tempest-horizon Change-Id: I1b6b5609412770609f412da4927641588b173ed6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 7b03643170974d4307e0f630e4c79340df98e06f) (cherry picked from commit 9441711c5a03a7a8c476dcc28e1fbace38b48654)
2020-04-11Add tempest_heat (heat-tempest-plugin)Cédric Ollivier2-2/+24
It asks for the Fedora-Cloud-Base image and a second user account. It should be noted that heat-tempest-plugin duplicates all configs from tempest. Minimal image is still Cirros and the first account is the admin one. Then it conforms with the TempestCommon logic. AodhAlarmTest is skipped by default because pre conditions are missing. SoftwareConfigIntegrationTest is skipped as in gates because it requires a custom image [1] [1] https://github.com/openstack/heat/blob/master/devstack/lib/heat#L444 Change-Id: I8b39dc65ef3714411cd828e17b95e124f2e90f34 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2020-04-04Reduce Tempest multi threadsCédric Ollivier3-11/+11
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 Ollivier2-1/+7
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 cntt-n/CNTT#1440 Change-Id: I8127df786c41af0d0285ef0e5cd1b28901685f65 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 461e532424648f03af61d058bedfd2191290b7cc)
2020-04-03Fix upper-constraints in tempest-based containersCédric Ollivier3-3/+3
Change-Id: Id7f82b314af05c6b8ec47ef3685fcc806e72f1a6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 749613f723ac25dc161b4311d20e3e691b7a8341)
2020-04-01Rename CNTT specific testcasesCédric Ollivier2-9/+9
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 Ollivier3-1/+108
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> (cherry picked from commit 719985c55d51fd7093753ae61de2328ea0543367)
2020-03-28pcre-dev is now neededCédric Ollivier1-2/+2
https://build.opnfv.org/ci/job/functest-smoke-docker-build-amd64-hunter/298/console Change-Id: Ia0d2ff72869e0ccf1b657532404f0000b77546e0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
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> (cherry picked from commit 1413d32a207502f88675e379264765687230884b)
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-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-18Update test case list in neutron-tempest-plugin-apiCédric Ollivier1-2/+22
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-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)
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 Ollivier2-2/+5
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-07Run tests sequentially in tempest_slowCédric Ollivier2-2/+2
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-11-26Add tempest_scenario and tempest_slow in smoke-cnttCédric Ollivier1-0/+50
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 tempest slowCédric Ollivier1-0/+17
It conforms with tempest-slow-py3 executed in Neutron Gates [1]. [1] https://logs.opendev.org/68/672568/6/check/tempest-slow-py3/49fece6/testr_results.html.gz Change-Id: I0c1c6f7be38c9fcdd1a32e5cfa2bc4d8414885e0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit bbe35dc42e442fa2669a24e7927d389188e42b4c)
2019-11-26Add functest-benchmarking-cnttCédric Ollivier2-0/+74
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 Ollivier2-2/+28
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)
2019-11-26Add tempest_full in ComplianceCédric Ollivier3-0/+108
Change-Id: Ib2898d48d21704a06cf1f4574df81f4f0dae3f52 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 97dffc8fa0c297854d2cb96e10833c40a7c949fe)
2019-11-25Add rally_sanityCédric Ollivier1-1/+23
Gnocchi and Barbican are not currently selected by CNTT. Then they are removed from the optional list. Change-Id: I46d16b2cabd832b2655606b0708a6f43721cb3c5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d673cd586a464079c35660e828d81952f2707b4f)
2019-11-24Switch to OPNFV Clearwater repositoryCédric Ollivier1-45/+77
Project Clearwater is backed by Metaswitch Networks [1]. They will therefore not be reinstating the 14.04 Project Clearwater repo server. Then all binaries have been compiled and published on http://artifacts.opnfv.org/functest/clearwater/debian Then it updates sources.list.d/clearwater.list [1] https://www.projectclearwater.org/ Change-Id: I529e59f8aeeafb96bafb7da8a1cce5c4c5a9e031 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0159c469d752fd41876c81995e113562650f73a0)
2019-11-18Add tempest_keystone in CNTT API ComplianceCédric Ollivier1-0/+18
It excludes test_federated_authentication as federation is currently optional [1]. Close cntt-n/CNTT#624 [1] https://github.com/collivier/CNTT/commit/2e4ae5d0f4ebf4ef4bbc2504ed6cd46388361c09 Change-Id: Ie322e7912c429543c5da92f8afb33de3e8e75c8a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 8384c497bd55b0e31e971b0e01b2f3744c07eccb)
2019-11-16Update to Xtesting 0.83Cédric Ollivier1-1/+1
It supports mimetypes and then eases reading the reports from browser. Change-Id: Ic38fca9fb05ca1ad76b589800b22bc78882c7806 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9df8ee861d2161a105598474092e5e83da88a354)
2019-11-16Optimize lxml build if armCédric Ollivier1-0/+1
Else it raises timeouts on travis-ci.org: https://www.travis-ci.org/collivier/functest/builds/612068457 https://www.travis-ci.org/collivier/functest/builds/612116863 https://www.travis-ci.org/collivier/functest/jobs/612116916 Change-Id: Id34144ebcdf3f418d5a07068434eb7aa96b023d2 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 6fd2216a21aad00a0c6fba272f04ee0319fc119a)
2019-11-15Upgrade cinder tempest plugin to 0.2.0Cédric Ollivier1-1/+1
One test passing in 0.2.0 seems buggy in 0.1.0: Can't revert volume 1c37f177-aef5-42f1-92d4-21dbd08777e7 to its latest snapshot 7a9f97c1-86bb-4f99-9aeb-a4bdc45ae923. The volume size must be equal to the snapshot size Change-Id: I5d36c7e38bd58e1606b616550373f670b08b3bd7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2019-11-14Add tempest_cinder in complianceCédric Ollivier1-219/+7
It conforms with Cinder Microversions and Feature [1]. It cleans the testcases which require CNTT updates (Keystone, Glance, Nova, etc.) [1] https://github.com/cntt-n/CNTT/pull/577 Change-Id: I8e719e9f48d70a860c0f879117144bb3ce6f4875 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 91de272c725a9a4d9d5b97381e574802036da8b7)
2019-11-14Add keystone-tempest-pluginCédric Ollivier2-2/+24
It adds tempest_keystone which runs the tests proposed by keystone-tempest-plugin [1]. [1] https://opendev.org/openstack/keystone-tempest-plugin Change-Id: I83db584c37fe63a549ccf396b03e034778254b3a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 22ec0c1008b81f368476d8cea84117a93d15dab2)
2019-11-14Add cinder-tempest-pluginCédric Ollivier2-3/+26
It adds tempest_cinder which runs the tests proposed by cinder-tempest-plugin [1]. test_incremental_backup is disabled because it currently fails vs Functest SUT (under analysis). [1] https://opendev.org/openstack/cinder-tempest-plugin Change-Id: I85b255eb05b9ab1c74c3829148da5230d6c7647e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit e46aa41172fa1bf63364505fbbf922323788ac98)
2019-11-14Update neutron-tempest-plugin-api regex (CNTT)Cédric Ollivier1-9/+2
It conforms with the last updates in API [1] adding Neutron QoS and Trunk as mandatory. QosMinimumBandwidthRuleTestJSON is skipped as it's not covered by OpenStack (and Functest) gates. [1] https://github.com/cntt-n/CNTT/pull/463 Change-Id: I54ff5e1fdb9b1e7265c63e3f66dfcf2f10db07d5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 0c07bc255968d21558d3aec8ac7e4dc7659a69a2)