aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack
AgeCommit message (Collapse)AuthorFilesLines
2019-04-09Set cinder service type in rally testsJuha Kosonen8-1/+99
As a precondition for executing scenarios requiring volume, Rally expects the presence of service named as "cinder". In a case when there is only cinderv2 and cinderv3 configured in the system, Rally fails to validate a testcase even the volume service is working ok. Testcases in question changed to use v3. Change-Id: I42e7f846e80d3647df274b2e03add94c9f0a34d6 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit ebc2b41505299846faeb2163d34d820a8ef2bdb2)
2019-04-01Update network context in selected rally testsJuha Kosonen2-18/+12
Network context not needed in following scenarios: NeutronNetworks.create_and_delete_routers NeutronNetworks.create_and_list_routers NeutronNetworks.create_and_list_subnets NeutronNetworks.create_and_update_routers NeutronNetworks.create_and_update_subnets NeutronNetworks.create_and_show_routers Router not needed in network context in following scenarios: NeutronNetworks.create_and_update_ports NeutronNetworks.create_and_delete_ports NeutronNetworks.create_and_delete_subnets NeutronNetworks.create_and_list_ports NeutronNetworks.create_and_show_ports NeutronNetworks.create_and_show_subnets This completes the patch skipping router creation [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/67429/ Change-Id: I80ea145a21168fd984cc9ef88d50af227f0d6ed4 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit b4b2e7f9a5a3cb3379b45ac4ddd0ef949974a698)
2019-03-30Skip router creation in selected rally testsJuha Kosonen1-6/+12
Do not create routers in those rally_sanity tests where the test does not require it. Change-Id: I6dd8a2b7579e11ca6ecc3b7383fa4d09a1e56ec3 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit d5e56ad6becd1bb2aa7dafbfccb37c6b84512955)
2019-03-24Remove SNAPS test_create_router_external_networkCédric Ollivier1-7/+1
test_create_router_external_network fails if DVR. Then CreateRouterSuccessTests has to be removed due to the interface between Functest and SNAPS. ft1.5: snaps.openstack.tests.create_router_tests.CreateRouterSuccessTests.test_create_router_external_network_StringException: Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/snaps/openstack/tests/create_router_tests.py", line 431, in test_create_router_external_network self.check_router_recreation(router, router_settings) File "/usr/lib/python2.7/site-packages/snaps/openstack/tests/create_router_tests.py", line 499, in check_router_recreation len(derived_settings.port_settings)) File "/usr/lib/python2.7/unittest/case.py", line 513, in assertEqual assertion_func(first, second, msg=msg) File "/usr/lib/python2.7/unittest/case.py", line 506, in _baseAssertEqual raise self.failureException(msg) AssertionError: 1 != 4 Change-Id: I09946de01b5d0f0c9b9a41a6520d6b2be51f5238 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2019-03-21Set ext net and name server in Shaker templatesCédric Ollivier1-3/+5
It sets the shaker args to override ext net and name servers [1]. [1] https://pyshaker.readthedocs.io/en/latest/tools.html Change-Id: I1cc6d52837e3c370db5ff59f024e96d7423be63a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 492f85284cbe3b78c66d60e187081701c8eb4869)
2019-03-21Set max_microversion to 2.60Cédric Ollivier1-0/+2
By setting max version (Queens), it avoids skipping any test [1]. [1] https://docs.openstack.org/tempest/latest/sampleconf.html Change-Id: I1641fd1daeddc91cfdbdd6957e750e85b22897df Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2019-03-19Do not allow testcase skipping in refstackJuha Kosonen1-0/+8
Set the result of refstack_defcore as failed if there were skipped testcases in a run. Change-Id: Id782c2dee511cefbafd5b4440f386fd66f934a47 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit cfd79ec4c39e215a25fc3d99fc5368e7d874f7bf)
2019-03-03Stop overriding ssh default timeoutCédric Ollivier1-3/+0
It should be modified by tempest custom yaml file instead. It's safe as the default timeout is bigger than the previous one. It also cleans the obsolete tempest/rally data in config_functest.yaml. [1] https://docs.openstack.org/tempest/latest/sampleconf.html Change-Id: Ibad02d8aaf90f154c82f3b60a6d3f04fc37bd7de Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 147f5a373b4c8659826f1f626bd9b6042afc3934)
2019-03-03Stop forcing non default operator roleCédric Ollivier1-2/+0
Member is the default value [1] and SwiftOperator is not created by default in OpenStack gates (devstack) This role should be modified by tempest custom yaml file instead. [1] https://docs.openstack.org/tempest/latest/sampleconf.html Change-Id: Ie77b91e36a7011e5730cbf5998e029c07ec7fe2f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 543884f5c2100878692260fd840624a549843238)
2019-02-27Gather all skipped tempest test casesPanagiotis Karalis1-1/+1
This patch applies a change to the regex responsible for identifying Tempest test cases. With the current regex some skipped test cases are erroneously ignored. The condition has been updated in order to match both format of skipped testcases ('skip:' and 'skip [xxx]:') Change-Id: Ie7144b01e07cae92918eede0324f3f1f2582c4aa Signed-off-by: Panagiotis Karalis <pkaralis@intracom-telecom.com> (cherry picked from commit 692c50bbeb01b57c184cd8629a534a19f9b9ad73)
2019-02-18Enrich Rally results outputStamatis Katsaounis1-1/+15
This patch adds success/failure information of rally test cases to summary output. Change-Id: Ie4f9b4972a26e187bb7afdddfd5ce51b16f3db12 Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com> (cherry picked from commit 13777d607dd219ace0157e560ff11c3cd6f1aad0)
2019-02-15Generate xunit reports (rally and tempest)Cédric Ollivier3-76/+93
It adds xunit reports for rally-based and tempest-based testcases. It completes the reports provided by snaps (thanks to Xtesting). All rally related operations are moved to rally. It allows removing the rally dependency to tempest which was false. Change-Id: Ia7d2476f58f4f68b7c88442e50cad844037a36e9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 3393f2016483555c27d612c69ec11274cc8aa72a)
2019-02-14Specify which rally tests to runStamatis Katsaounis1-18/+14
This patch adds the ability to specify which rally test to run by setting the appropriate configuration value. Change-Id: I6cbc9d12aada4f8eab68d2219d94ae1391a79021 Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com> (cherry picked from commit d0cb38d7ad5046700564f2700df9b8c92706b32c)
2019-02-13Publish tempest details into databaseCédric Ollivier1-1/+1
It switches from tempest.log to rally.log to conform with rally/stestr. Change-Id: I00c2a268a2bc312a22a8d70278fad618c1c25235 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 4afaf09c94da6e98ca449a7495f158e2d30255e5)
2019-02-13Generate one single report for Rally testcasesCédric Ollivier1-9/+17
It eases sharing one single report including all task results. For the time being, rally_jobs only generates neutron.html. Then it only adds one report for rally_full and rally_sanity. We may consider generating only one json file but it asks for a refactoring (result parsing) which can be done in a second change. Change-Id: I8fa75ae80750336950f355c2aedc3dd4dc621cc5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 2df7a0728d687de9a24d8432ef30bbd2ecd771c8)
2019-01-31Allow running latest tempest_fullCédric Ollivier1-0/+5
It allows running test_user_update_own_password [1] [1] http://artifacts.opnfv.org/functest/functest-opnfv-functest-components-latest-tempest_full-run-8/results/tempest_full/tempest-report.html Change-Id: I9f273ba58871f1e16886af623dcbb91f5c20c2f6 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9cd8ca6db84fd80f17b2d9c37d66d6a861130e7a)
2019-01-28Remove CreateInstanceVolumeTests (snaps_smoke)Cédric Ollivier1-7/+1
The volume and the virtual machine created are not deleted. Change-Id: I238fcb0839a2f609333080bc8c88b84327d51475 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 14d26a963665f17dc01d95bb996e1ae91ac44f03)
2019-01-28Decrease volume_size in all Rally testsCédric Ollivier3-7/+7
Devstack allocates a 24G disk image by default [1]. It can be easily reached by setting volume size to 5G or 10G. [1] https://github.com/openstack-dev/devstack/blob/master/stackrc#L779 Change-Id: I7c35d8f333718d6c192a9f12a714e626d60b1895 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 890d9a764bf88752d36983802f375d5e29c2bee2)
2019-01-28Clean project/user if snaps tests are skippedCédric Ollivier1-0/+1
Change-Id: I88a58516a3620cc6b19013313672ad1a80791e70 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit c9b7fe1da2432581d30bb166d381ac72fce33e97)
2019-01-27Merge "Stop using urljoin when adding v3" into stable/gambiaCedric Ollivier1-3/+1
2019-01-27Merge "Set Gnocchi scenario as optional in rally tests" into stable/gambiaCedric Ollivier1-6/+10
2019-01-27Stop using urljoin when adding v3Cédric Ollivier1-3/+1
urljoin works here only if url ends by /. It replaces identity by v3 when running vs devstack. Change-Id: Id896f2b54dfcabadaad1137deef91b1cb07c697d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9e4e6f049fa7d5cce8db61dfa2ebebc55f91c1d8)
2019-01-27Set Gnocchi scenario as optional in rally testsJuha Kosonen1-6/+10
The execution of an optional scenario is skipped if the corresponding openstack service does not exist. Change-Id: I8721f26ebc253ce02138b85d6c88e659c5afae80 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit 3b7b393ca643bcf7db0361bcc4414b74fff953be)
2019-01-27Remove test_get_endpoint_with_each_interfaceCédric Ollivier1-5/+1
It checks all 3 endpoints for image but nothing forces to define them. Here is the only endpoint created by devstack. glance | image | RegionOne | | public: http://192.168.1.10/image [1] keystoneauth1.exceptions.catalog.EndpointNotFound: internal endpoint for image service in RegionOne region not found Change-Id: If501b849fbbed6df98742db21e924094c1df9c7f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9675c5a0cb2ccd698451a5930708263be5eba527)
2019-01-20Fix one typo in docstring (tempest.py)Cédric Ollivier1-1/+1
Change-Id: I46053c92660139f4004d9cec8d1cfb6817cc0e07 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit bf976b4f606860630ffa967fe70a36a7e5954828)
2019-01-20Take control over Rally logicsCédric Ollivier1-4/+25
Rally selects the first external network [1] which could raise side effects if: - another testcase is creating a dummy external network in // - all external subnets are not reachable from jumphost It's now overriden by EXTERNAL_NETWORK as defined in Functest Rally creates a new shared network if one already exists [2]. As juju now allows other shared networks, it can be safely created by Functest to allow only one logic and to handle provider networks, different name servers, etc... [1] https://github.com/openstack/rally-openstack/blob/master/rally_openstack/verification/tempest/config.py#L146 [2] https://github.com/openstack/rally-openstack/blob/master/rally_openstack/verification/tempest/context.py#L85 Change-Id: Icf8c08077d4b0a9eb1c2e1b7309c62957b0a3b63 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit ee52195f4476d3debf9c3f92c6d808256a199500)
2019-01-20Move logics out of TempestCommon.__init__()Cédric Ollivier1-22/+33
It conforms with best programming practices. It allows muting console and increasing log level (debug). Change-Id: I0e0cfef6abe3b354a43817fcb242c71da701e237 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit b482b494ce695e83cca0a10e7750200fd1be42ea)
2018-12-20Select Rocky for Neutron Rally jobsCédric Ollivier1-1/+1
It fixes our gates (the testcase was developed just after OpenStack Rocky). Change-Id: Ic1eac9a54115a56c60e609faea818989cd2bfce8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-12-16Fix NEUTRON_RALLY_TAG in smokeCédric Ollivier1-1/+1
It also fixes rally task name in config. Change-Id: I4f6fbbef814a5b45aeb3b6152878421fc6e998bc Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 58df8ab5544a5bfff43dc6c4a2546194299a7734)
2018-12-07Remove duplicated code in vnfsopnfv-7.1.0Cédric Ollivier1-3/+2
It mainly leverages on functest_utils instead of duplicating. Change-Id: I97dc9215a835d3e7f1527b565132f667f09f2b7e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 555956f1d19800114a6f422de78816859aaa7bdc)
2018-12-01Remove Snaps NovaUtilsInstanceVolumeTestsCédric Ollivier1-5/+1
It doesn't clean its resources and then breaks the gate after multiple runs. It's the only way as Snaps is inactive and pinned in Functest. Change-Id: I5bb8707edaf998b91b8d5642b48465d4247cf8e7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 2e278acd3797f71d04500b3e9892a1769044b682)
2018-11-25Fix an invalid class name (vGPU)Cédric Ollivier1-2/+2
Change-Id: Ifff9eff1984846937920124ad0a7790e20593b25 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d263576bd9961b4177080ff75844d0ed47dc886a)
2018-11-17Rename Rally blacklist.txt to blacklist.yamlCédric Ollivier2-1/+2
It eases editing it or verifyfing it via yamllint. Change-Id: I380830eff5f404745e284067b5a10f58dc60b80e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f600874cef933a2077a51bb334365a861e6fbb48)
2018-11-11Check if at least 2 hypervisors (Shaker)Cédric Ollivier1-0/+6
Shaker is now skipped if only one hypervisor. Change-Id: Ib3f803ab61e66e0daba0622ead0c1bf0905d0cce Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 07a5762fd3e929a50c49785f2e583dba20a0ba4a)
2018-11-10Check if at least 1 hypervisorsCédric Ollivier2-1/+7
Vmtp is skipped if only one hypervisor. As Vtmp returns 0 when all is skipped, it protects vs issues when generating charts. Change-Id: I5ea7c31c0688ae773425d2192a4f30a22360185f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 396b3d8a7a9036ae3a8a8443b489654d3a2dd3cb)
2018-11-07Merge "Disable agent testing in tempest-based testcases" into stable/gambiaCedric Ollivier3-3/+13
2018-11-07Remove snaps ansible test casesCédric Ollivier1-7/+0
They can't work vs all OPFV scenarios (MTU doesn't conform with Geneve) and are deprecated. Updating snaps commit id [1] breaks all gates closed to Gambia release. [1] https://gerrit.opnfv.org/gerrit/#/c/64515/ Change-Id: Ie4a7a694703642a74b731a4142a5c8c029f7e661 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 24a7b14c20ad96f10db0d8bfa6187c1b7c9737b9)
2018-11-06Disable agent testing in tempest-based testcasesCédric Ollivier3-3/+13
It blacklists agent testing and two tests asking for VXLAN as overlay if OVN (OVN supports GENEVE) [1] blacklist.txt is renamed blacklist.yaml and is verified by yamllint. [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-gambia/33/console Change-Id: I73c1b8cbbd74973a7f15476feea6ee4532786660 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 3b07c3e741e0e64603d01afc651176aa2fc52391)
2018-11-06Increase Vmtp timeoutsCédric Ollivier1-0/+1
It now conforms with other testcases booting ubuntu images. Change-Id: If9b610646ee5dcb2eb002d74dff8e1a797a4f232 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 023a4c7d0cb85d3b624ee946097e721880169371)
2018-10-27Move tempest logics in tempest_conf.yamlopnfv-7.0.0Cédric Ollivier2-29/+14
It allows removing OPNFV logics out of Functest (releng) and then simplifies conf_utils. tempest.conf is filled by the current default values. functest-alpine.sh will be updated to allow modifying the default values without breaking the OPNFV installers. It deprecates the only tempest-related env var (STORAGE_PROTOCOL) Change-Id: I14bcb715826ef2d85af87e7af600261a3c08e72c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 3872290bb673513459588bbe83e65efc631615f7)
2018-10-26Temporarily disable Cinder volumes backup testsCédric Ollivier1-0/+3
From the time being, all OPNFV installers [1][2][3] don't support Cinder volumes backup. We will find a better way to handle the lack of OPNFV requiremements (these tests pass succesfully in Orange Openlab). At least, it will allow verifying tempest_full in OPNFV gates. [1] Apex: https://artifacts.opnfv.org/logs/functest/lf-pod1/2018-10-25_02-17-25/tempest_full/tempest-report.html [2] Compass: https://artifacts.opnfv.org/logs/functest/huawei-virtual9/2018-10-24_04-54-25/tempest_full/tempest-report.html [3] Fuel: https://artifacts.opnfv.org/logs/functest/lf-pod2/gambia/2018-10-25_05-57-54/tempest_full/tempest-report.html Change-Id: I319536070aa77a5dbab6a692a1d76049f75e758b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 7cf46992c7f3e854b038f6f17a279d65108aa764)
2018-10-26Temporarily disable VNC testsCédric Ollivier1-0/+3
At least Compass and Fuel configure Spice as console [1][2]. It disables vnc testing as it could fail for endusers as well. [1] https://artifacts.opnfv.org/logs/functest/huawei-virtual9/2018-10-24_04-54-25/tempest_full/tempest-report.html [2] https://artifacts.opnfv.org/logs/functest/lf-pod2/gambia/2018-10-25_05-57-54/tempest_full/tempest-report.html Change-Id: I2a1ecf345cb81170c1b1a3e49f8f3a58602fc3f0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit df9d5c5d3b80b613130de59a1810f7fce9cbbc0d)
2018-10-23Disable Glance API v1Cédric Ollivier1-0/+4
It has been deprecated since Newton [1]. Even if the related tests are skipped in latest tempest [2], API v1 has to be disabled in Gambia's tempest.conf [3]. [1] https://docs.openstack.org/glance/latest/user/glanceapi.html [2] https://artifacts.opnfv.org/logs/functest/lf-pod1/2018-10-22_02-34-24/tempest_full/tempest-report.html [3] https://artifacts.opnfv.org/logs/functest/lf-pod1/gambia/2018-10-23_10-34-07/tempest_full/tempest-report.html Change-Id: I3b6bb632412c0fecaa659da262760af64d79fa71 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit dddd8073c97ca09937504cb10c1a7be2a0986380)
2018-10-23Overprotect vmtp vs unversioned OS_AUTH_URLCédric Ollivier1-0/+4
It simply adds v3 to OS_AUTH_URL if required. Vtmp should be updated to manage unversioned url [1]. https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/371/console Co-Authored-By: Juha Kosonen <juha.kosonen@nokia.com> Change-Id: I4806e811c0714b061b77f940934830cfb1835d74 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 5ac878fe7cccbfe5cb829488d0aedc307dd42885)
2018-10-22Change dir when calling stestrCédric Ollivier1-2/+5
https://build.opnfv.org/ci/view/functest/job/functest-fuel-baremetal-daily-master/467/console Change-Id: Icaa773cf61397650e73a01b182a759dd64b11b95 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d1eed120e18ec456841a8df2f29e1711da0aa833)
2018-10-21Harden Rally generate reportCédric Ollivier1-3/+2
It converts html_file to str and raises all possible exceptions. It sometimes fails when locally generating reports. Change-Id: Idf6a12aaac4561800cd5e364f8bcc495aabbee1d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 4d3627e56d333e313b67bbf1e7880b11883b5652)
2018-10-21List neutron exts and service providers in connection_checkCédric Ollivier1-1/+7
It eases debugging as well [1]. [1] https://artifacts.opnfv.org/logs/functest/lf-pod1/2018-10-20_12-23-41/patrole/tempest-report.html Change-Id: Ie9ddc280fc239c5e0887347d434839940e7a3240 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 87f5db13d594075903face649f877478edb3b285)
2018-10-16Do not create files in site-package directoryJuha Kosonen2-9/+22
Use /home/opnfv/functest/data/rally/task directory for storing temporary files when running rally tasks. Also removes unused vm scenario from task service list. Change-Id: Icfd4f99ebe6194360bda8bd88e497e018a9541a0 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit 520331a06750dd02228f840c346402f52fb864e8)
2018-10-14Fix image properties parsingCédric Ollivier2-20/+7
It removes useless spaces and now conforms with oslo.conf dict. New helpers and unit tests are available. Change-Id: I20335c5e5c3840cc872e158c6072d97a3f2cb98c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 904377462f58464937d4cafeb8c432f024a85bd4)
2018-10-09Add Rally scenarios for testing floating IPJuha Kosonen2-0/+51
rally_sanity: NovaServers.boot_server_associate_and_dissociate_floating_ip rally_full: NovaServers.boot_server_associate_and_dissociate_floating_ip NovaServers.boot_and_associate_floating_ip Change-Id: I31b7693828920bae92ff4ac8e7b0fde86e958cb5 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit 6efcc4fe7456663445e9fbda54bba3239288ad73)