summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - [salt-formulas] opendaylight: Fix noproxy case Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b52c4df4061fd7a51aad94f144bb1326fa8a8b5a)
2018-07-02Update git submodulesOnong Tayeng1-0/+0
* Update docs/submodules/releng from branch 'master' - Tagging FDS for Fraser 6.2.0 Change-Id: Idebf9d0d49ef9d57901615ddf15595545031f093 Signed-off-by: Onong Tayeng <otayeng@cisco.com>
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/fraser' - u/fuel: Bump for ODL keyserver prx rework Change-Id: I072da6af13f706a1159a9b2a2196ba363087179c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - [salt-formulas] opendaylight: Adjust keyserver prx Align opendaylight/server sls with the latest salt-formula-linux version of keyserver requests support behind proxy. Change-Id: I55f9010eec8b74932d4a28215ecf9647deb3d82c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6924fe7e4cadeb5dbe6857adb413d688209bd4e1)
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/fraser' - u/fuel: Bump for release tag update in docs Change-Id: I3191f4392c9b84cfc8e035bd64a144b6d7159755 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - [docs] Bump release tag to 6.2.1 Change-Id: I011f34535363d02ef726dfafd6abe0d3c6b4df5f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 61783aec0db25652b11d6858b3103cc12d540b76)
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/fraser' - u/fuel: Bump for APT allow-upgrades Change-Id: I76cfc1fc0b262e0a673f87f056e47257c9ea7ad8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - [apt] Allow downgrades during APT operations Pinning certain packages (e.g. OVS) interfers with `dist-upgrade` if downgrades are not explicitly allowed. Change-Id: I0b001936e86228037c30f30812e32d6221ef458d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/fraser' - u/fuel: Bump for Armband repo pinning Change-Id: Ic15e85e5a923937e998163267f07d098c06c1611 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - [AArch64] Pin armband repo with highest prio Mirantis repositories shadow certain packages from Armband repos (e.g. qemu-efi) if pinning is not set. Since MaaS does not allow configuring repo priorities via its API, use Salt pillar data to re-define the Armband repo and set its prio. Change-Id: Ic743f4b684b3f13552792f5f04097fac73171b37 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d6d2348ee690768101ff661c7811c25d9c65c104)
2018-07-02Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/fraser' - p/fuel: Drop upstream nova patch for virtio-video Change-Id: I12ac18f4348e8aecca2a1934a69ef7ebfa8f0c95 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Tagging Bottlenecks F release 6.2" - Tagging Bottlenecks F release 6.2 Change-Id: I7df15a89379ce0e30eba0bd00ae9fbb76056970d Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
2018-07-02Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Fraser Tagging: 6.2.0" - Fraser Tagging: 6.2.0 vswitchperf tagging. Change-Id: I93a7d97e89d493b2ace9bf2c00b1932a89bab772 Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
2018-07-02Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[yardstick] fraser opnfv-6.2.1 release tag" - [yardstick] fraser opnfv-6.2.1 release tag fix opnfv-6.2.0 bug: docker image build failed JIRA: YARDSTICK-1278 Change-Id: Ifac06060ffedf6c8300e371600f1af2ce928dd14 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-07-02Update git submodulesStephen Wong1-0/+0
* Update docs/submodules/releng from branch 'master' - Tagging opnfv-6.2.0 for Clover Change-Id: I350cce402226444fa0dda75e64405cfcb20a3519 Signed-off-by: Stephen Wong <stephen.kf.wong@gmail.com>
2018-07-01Update git submodulesrexlee87761-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Yardstick Fraser Release notes - 6.2.1 JIRA: YARDSTICK-1278 Change-Id: I96d54b06f0ef794c9c0ec26d78eb54ebcc6462ed Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-07-01Update git submodulesrexlee87761-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Bugfix: uwsgi config file yardstick.ini output error JIRA: YARDSTICK-1280 Change-Id: I45b4b781cee21035897ba0c34dc740af6365e918 Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit 27858564cfaf4809808de52a843d2c60c13326e2)
2018-06-30Update git submodulesPeriyasamy Palanisamy1-0/+0
* Update docs/submodules/releng from branch 'master' - update fraser 6.2.0 release tag for sdnvpn Change-Id: Id78fbfe1cb2e0ace44d2e6acf688e4115941a84a Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
2018-06-30Update git submodulesrexlee87761-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Bugfix: docker build failed Due to no inventory.ini specified in Dockerfile, which resulsts in ansible-playbook run fail JIRA: YARDSTICK-1277 Change-Id: Iaf689b71b8c86b54b2451d8a8c480f7d94d53561 Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit ce9a39a0e9e2747afa722f360ddc74dc697b3217)
2018-06-30Update git submodulesting wu1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Bug Fix: correct the file path to build docker file To be able to build a docker file, the path to file "exec_tests.sh" should be modifed from .docker/exec_tests.sh to ./exec_tests.sh. JIRA: YARDSTICK-1157 Change-Id: I0f707ba579039d0efc8f2185b596e23b901c09df Signed-off-by: ting wu <ting.wu@enea.com> (cherry picked from commit e5c9c487105f0bbe6416e612da77f5c93b9b354c)
2018-06-30Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/fraser' - Update release notes for 6.2.0 Change-Id: I140b02cb0b7c991f0818b7d3e3447e8485e923ee Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-06-30Update git submodulesJohn O Loughlin1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Fix ansible scripts for running in container JIRA: YARDSTICK-1147 Change-Id: I52dae85a2d97192bc8a48c5aeea3173b3d4de003 Signed-off-by: John O Loughlin <john.oloughlin@intel.com> (cherry picked from commit 5db2f11d309d42cdf7cf177b86d31deb3fe58e37)
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Adds StorPerf 6.2.0" - Adds StorPerf 6.2.0 Change-Id: Iec76686129f9cd53603e6a73df45681979e4a695 Signed-off-by: mbeierl <mark.beierl@dell.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update in release tag for sfc" - Update in release tag for sfc Change-Id: I1e410851dc4e4dcbb2844af9c35cb0b5bb91ac94 Signed-off-by: Manuel Buil <mbuil@suse.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Apex: update release tags for 6.2" - Apex: update release tags for 6.2 Change-Id: I4d6e12a6975b5a3e49fc50eeca71514d118cf235 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Tag snaps-oo with 6.2 for fraser" - Tag snaps-oo with 6.2 for fraser patch 2, selected wrong SHA earlier Change-Id: Ibf3176a048c6e9e882cd997f3bc74ae986d7bbf8 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[release] Fuel, Armband: Release opnfv-6.2.0" - [release] Fuel, Armband: Release opnfv-6.2.0 Change-Id: I704c09f22098023ad39b835a982a58159ac45ff0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[yardstick] fraser opnfv-6.2.0 release tag" - [yardstick] fraser opnfv-6.2.0 release tag merge after patch https://gerrit.opnfv.org/gerrit/#/c/59349/ Change-Id: Icf2a16659f2804eaef95c83ee7d959b7e73441eb Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "updated auto.yaml with 6.2.0 commit" - updated auto.yaml with 6.2.0 commit JIRA: AUTO-41 Change-Id: I6952b19687eef464040b47ccc116597f0cb9b397 Signed-off-by: Gerard Damm <gerard.damm@wipro.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Tagging opnfv-6.2.0 for IPv6" - Tagging opnfv-6.2.0 for IPv6 Change-Id: Ic0d7b8976d91239bca61f01396fc0423e51ac578 Signed-off-by: Bin Hu <bh526r@att.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Tagging SampleVNF stable/fraser branch for Fraser 6.2.0" - Tagging SampleVNF stable/fraser branch for Fraser 6.2.0 Change-Id: I6312e57c689519bdf65a562db85acfb443ac7b68 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2018-06-29Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Publish Functest 6.2.0 tags Change-Id: Ieef2d00e57af2c06f588f4f819b9eaf402830a07 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-06-29Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/fraser' - Update docs for 6.2 Change-Id: I969f72b5b097d6f23a8082021b886b21198fafb2 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "tagging compass4nfv Fraser 6.2 release" - tagging compass4nfv Fraser 6.2 release JIRA: - check ip_forward and set to 1 Change-Id: I23f8757339a0433d79d0973366be2db15c6760a3 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-06-29Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Fix release tagging script git cat-file can't output the tag information for a tag, but it can output the commit information a tag points to. Change-Id: I147941e2c0ba6defe212dbd0fc8c8a3a1fe0c728 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-06-29Update git submodulesrexlee87761-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Yardstick Fraser Release notes - 6.2.0 JIRA: YARDSTICK-1261 Change-Id: I61adeaea8a727605481ffce9dae9646f160bf401 Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit 1b9bca5b7b51d79bab432a10e16bdb0d69a80dfe)
2018-06-29Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Merge "Update docker image tag to 6.2.0" into stable/fraser - Update docker image tag to 6.2.0 Change-Id: Iec55c8f400d5413f173359d21cb1cc3b3d4f935f Signed-off-by: Emma Foley <emma.l.foley@intel.com>
2018-06-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/fraser' - u/fuel: Bump & rebase for MaaS fabric extension Change-Id: I778c2ddde72b29fdd614cde2db5a1c0fe808dbe6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - [patch] MaaS: fabric ID from CIDR Change-Id: I1e1490f4d0a0bee2783450c6369d7ab6c45b193f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Update git submodulesChornyi, TarasX1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - NFVI support for standalone, baremetal and heat contexts JIRA: YARDSTICK-1257 Change-Id: I6733bd49ac91985e8f3d7722e6990e8733bb430e Signed-off-by: Chornyi, TarasX <tarasx.chornyi@intel.com> (cherry picked from commit 005358a39a87e42061dd5b344916c2ffe0475961)
2018-06-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - [fuel, armband] verify: Use same node for deploy JIRA: FUEL-375 Change-Id: I01f17a28fdb1bd692d1997b0a32be66de8856a8b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - fuel-deploy: Add temporary iptables rule Functest Docker has issues connecting to Openstack clusters on Ericsson virtual PODs due to iptables rules interfering. Apply old iptables workaround from functest, at least until we rootcause and fix the issue on those virtual PODs. JIRA: FUNCTEST-985 Change-Id: I01b6788e5dd7a9fd64e80e3e78d7cd8828570cb1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Update git submodulesmbeierl1-0/+0
* Update docs/submodules/storperf from branch 'stable/fraser' - Update release notes Change-Id: I41ae2a5730684056e6854f22201544c5c486bd3e Signed-off-by: mbeierl <mark.beierl@dell.com> (cherry picked from commit a6c0c07da775203c813bc9a0effba6e0d37d15f7)
2018-06-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/fraser' - sysinfo_print: Dump all iptables rules Change-Id: I0ce6d21e14efe6e5236759c8d8b3439f09e89675 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fa26dabea271cee86c71b95f7d4650ef53eb2419)
2018-06-29Update git submodulesYang (Gabriel) Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/fraser' - Modify ping test threshold Change the threshold to 5 VM pairs for basic common OPNFV verification requirements from Dovetail. Currently, offline test over apex pass: 1. ping subtest1: https://gist.github.com/gabrielyuyang/764b7ee636ac5502d5e561a348ae909b 2. ping subtest2: https://gist.github.com/gabrielyuyang/af17905a7e2379e870f492ea393c54c0 Working on testig over compass, trying to deploy a compass first. We could also see the result from compass on CI after this patch be merged. Results in Dovetial CI will also be updated then. Change-Id: If2cfe9988c046d733b30a23de3cd569ed06496e6 Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 62feef57918f110d423961a3989f77cf815058c6)
2018-06-29Update git submodulesXavier Simonart1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Fix NSB NfVi support for 25 and 40Gbps When setting interface_speed option in the test case, NSB/PROX was still considering 100% as 10 Gbps. With this fix, when interface_speed is set to for instance 25 Gbps then NSB/PROX will start generate at 25 Gbps. Yardstick logging info printed on the screen will show performance result as percentage of interface_speed (e.g. 100% will be 25 Gbps). This is done by sending the command "speed 250" to PROX (PROX cannot know the underlying interface speed in all cases e.g. in virtio, and hence considers 100% as 10Gbps). JIRA: YARDSTICK-1217 Change-Id: I4989161b04a7afa5e347935ee7ccef7dfe5a504d Signed-off-by: Xavier Simonart <xavier.simonart@intel.com> Signed-off-by: Emma Foley <emma.l.foley@intel.com> (cherry picked from commit 1d61af34eb7b35b912d124768ad26eb5f0cd03a8)
2018-06-29Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Merge "NSB Topology fix for Prox 4 port test case" into stable/fraser - NSB Topology fix for Prox 4 port test case The uplink and downlink interfaces for the 4 port test cases were inconsistent and fixed in this commit. This affects all the 4 port PROX test cases. Tested on: Heat L2fwd-4 and L3fwd-4 test case. JIRA: YARDSTICK-1185 Change-Id: Ia2ce7ed0dc395b812f84ede94e259b42dc833579 Signed-off-by:Abhijit Sinha <abhijit.sinha@intel.com> (cherry picked from commit 8ebd2d3fde473ffcd139090bd688882d4e5e0f44)
2018-06-29Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Merge "NSB NFVi BNG test fails to run - stops after one step" into stable/fraser - NSB NFVi BNG test fails to run - stops after one step JIRA: YARDSTICK-1244 When sending the start or stop command to PROX. We sould not send the same core. We should not send "start 1,1" instead we should send "start 1" Change-Id: Ie600dc3ed808fd00341e92f13bd52199e68dc51f Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com> (cherry picked from commit e219f22429ad2e6e6060c5c3440df72e014be273)
2018-06-29Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Merge changes from topic 'prox-stable/fraser' into stable/fraser * changes: NSB NFVi PROX BNG losing many packets NSB NFVi PROX VPE losing many packets Decrease Sampling interval Addition of Configurable Sampling and Configurable Confirmation Retry - NSB NFVi PROX BNG losing many packets JIRA: YARDSTICK-1101 Problem was incorrect generator and changed the traffic profile to allow a tolerated loss of 5%. ARP packets are not managed (just passed thru the system) therefor the tolerated loss must be higehr than normal. Change-Id: I03bd62b397a66b50961e810d033c6894d0b3e9a6 Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com> (cherry picked from commit 48c9e48dcff498c8f51ec507d4107bc658b82d82) - NSB NFVi PROX VPE losing many packets JIRA: YARDSTICK-1105 Running a vPE test ends up with up to 25% drooped packets. This is due to tolerated loss being incorrectly configured, test duration was too short and test interval was too short. Note This is due to the fact that vPE use case have by default a tolerated loss of 100%, Now changed to 0.001, same as L2FWD Also: Grafan dashboard has been updated to show all SUT CPUS Utilization in 1 panel. And LINE rate MIN, MAX & TEST Rate have been added Change-Id: I7adae2199b3f656fe460705b6aeb3aa69c767d50 Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com> (cherry picked from commit 39b3d9ae8ff19a0d64bff0e874f05b6dbcc30b01) - Decrease Sampling interval JIRA: YARDSTICK-1219 Currently NSB for NFVI using PROX returns sampling information every 13 seconds. This is too slow. It is required to return sampling information form Generator AND VNF at least every 1 second. This change is depandant on JIRA: YARDSTICK-1212 and YARDSTICK-1220 Change-Id: Ica7ab795a2919d191d8cd846d028e15739e33fb7 Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com> (cherry picked from commit f8b45aca386ed5852d9568c531ba4595c68cc0e2) - Addition of Configurable Sampling and Configurable Confirmation Retry JIRA: YARDSTICK-1221 In order to increase accuracy of result the following are done :- - Improve Measurement Accuracy (YARDSTICK-1212) - Improve Sampling Interval (YARDSTICK-1219) - Allow 4 PROX ports to be read simultaneously (YARDSTICK-1220) This change does the following :- - Stores LINE Rate statistics of Sample - Requires a confirmation retry before deciding to increase or decrease this is configurable. - Allows the user to disable Sampling or specify a sample interval - Added Code Coverage of ProxDurationRunner based on YARDSTICK-1199 Change-Id: I27242ac1849c9a2712866385b5fbc05977c71516 Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com> (cherry picked from commit 2e447af9a5a54355aa20028813660d07d1bd2e18)
2018-06-29Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'stable/fraser' - Merge "Convert SLA asserts to raises" into stable/fraser - Convert SLA asserts to raises This commit converts Python assertions to a custom exception in all places where SLA validation is checked with an assertion. This commit also fixes all emerged pylint errors. JIRA: YARDSTICK-966 Change-Id: If771ed03b2cbc0a43a57fcfb9293f18740b3ff80 Signed-off-by: Miikka Koistinen <miikka.koistinen@nokia.com> (cherry picked from 39f80e9b06395ae1515cfcf08508504ad4dd978a)