summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[PDF] check-jinja: cleanup, compact output" - [PDF] check-jinja: cleanup, compact output The Pharos git repo already has a CI verify job for `yamllint`-ing the PDF files (check-jinja input yaml), so drop that check and keep linting only output YAML files. While at it, slightly rework the output log to make it easier to read. Change-Id: I2e47902d71514709eb48432f87d6ce68fb795d73 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge changes from topic 'yamllint-fix' * changes: [PDF] check-jinja: Replace encrypted str w/ dummy [PDF] Fix yamllint issues in installer adapters [PDF] check-jinja: Disable check against template [PDF] generate_config: eyaml only encrypted PDFs - [PDF] check-jinja: Replace encrypted str w/ dummy During PDF validation using `check-jinja.sh`, most if not all encrypted strings will fail to decrypt due to missing keys on the build server. The templater will fallback to using raw plaintext, leading to `line too long` yamllint violations. Since we don't care about the actual value of the unencrypted string, replace the encrypted one with a dummy (shorter) string. Change-Id: I0f96db0e055bf84ad43a1df4a0f2bd86cc50fd22 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] Fix yamllint issues in installer adapters Although current YAML files in Pharos are all valid according to yamllint, the resulting YAMLs after PDF/IDF + IA interpolations still have a lot of violations, which need to be addressed. PDF changes: - bii/pod1: + fix typo in disks_A reference; IDF changes: - replace empty strings with `~` keyword (will be expanded to 'None'); IA (installer adapter) changes: - apex: + add missing document start; - compass4nfv: + too few spaces before comment; + missing starting space in comment; + replace '\t' with spaces; - daisy: + None; - fuel: + check conf.idf is defined first (fix parse for PODs without IDF); + move document start outside conf.idf condition - joid: + None; This is not an exhaustive change, some yamllint issues are still there but require either refactoring IAs or changing the PDF/IDF files in a way that needs the respective maintainer's input. Change-Id: I26743e265217e892b6a94de96a016c295ea24fb5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] check-jinja: Disable check against template config/pdf/pod1*yaml files are not valid PDFs, but only templates. Trying to expand said files against installer adapters would lead to funky results, since most fields are expressed as '{val1|val2}' in the template files. Change-Id: Ieec4d596d0b5246aa506239183a31463951403e7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] generate_config: eyaml only encrypted PDFs Silence misleading warnings about failed decription for PDFs that do not use this feature. While at it, print yamllint version used by check-jinja.sh. Change-Id: Ica1ff90abaee8c9bb20996899c8f0a7527133618 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-15Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Setup mongodb master primarily Initiate mongodb master at first to avoid race conditaion with unwanted master election which causes cluster setup failure. Change-Id: I6d2f75f3f002849cac3a5f52a7dcfb4646b7822a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-01-15Update git submoduleswutianwei1-0/+0
* Update docs/submodules/pharos from branch 'master' - Add the huawei-pod1 PDF and IDF it include the information about the huawei-pod1 such as, cpu, memory, disk, interface, BMC and encrypt the ipmi user and password Change-Id: Ie93a84bc3953f7c35514813e99334adb260efed1 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-15Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Upload new helm-chars for ping and virtio-user-ping Change-Id: Ib25ea5711c4efbd07093df22c383f70ab28b62ca Signed-off-by: Xuan Jia <jason.jiaxuan@gmail.com>
2018-01-15Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Create helm-charts and nfv-pass directory Change-Id: I4fe3ebe772d5f6af60ca86d7175de7d8ecb94f6c Signed-off-by: Xuan Jia <jason.jiaxuan@gmail.com>
2018-01-15Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "Fixes including default SDN env file in deploy cmd" - Fixes including default SDN env file in deploy cmd The latest method to deploy opendaylight features upstream is to include the default SDN file and then add-on the feature env file which should override any default settings in the previous SDN env file. For example for bgpvpn: openstack overcloud deploy -e <tht_dir>/neutron-opendaylight.yaml -e \ <tht_dir>/neutron-bgpvpn-opendaylight.yaml This change documents the recursive function used to find the SDN env files and includes the default for the SDN controller. JIRA: APEX-555 Change-Id: I4270932ca4fbc21ea54e965d9d6491424f4463e2 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-01-15Update git submodulesGeorg Kunz1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Changing CVP to OVP in the documentation Due to the name change from 'CVP' to 'OVP', the documentation has to be updated. Change-Id: Id934e8fc07f60802f7aa6b3d295d268c4c9b71f8 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-01-15Update git submodulesAaron Smith1-0/+0
* Update docs/submodules/barometer from branch 'master' - Merge "docker: ves update paths + rename dir" - docker: ves update paths + rename dir Update the paths in the Dockerfile to copy the bash startup script to the correct location. Rename the ves directory to barometer-ves. Change-Id: I13705a6c50d4487581e2ac7a4d0d2f6032db6415 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-15Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Add exceptions and test cases" - Add exceptions and test cases Change-Id: Ifc4611833e22a4be6404f0c5e61dae8737d44cec Signed-off-by: ReemMahmoud <rfawzy.ext@orange.com>
2018-01-15Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Revert "container4nfv: Disable jobs until the project stops changing docker version"" - Revert "container4nfv: Disable jobs until the project stops changing docker version" The project fixed their build script to stop reinstalling docker which downgrades it so the jobs can be enabled back now. https://gerrit.opnfv.org/gerrit/#/c/50603/ This reverts commit c9aac428e09385a5893313a99b6af6652dafd216. Change-Id: I529850be56e30e4fdd66929809628b89e3a2ed8f
2018-01-15Update git submodulesPeriyasamy Palanisamy1-0/+0
* Update docs/submodules/sdnvpn from branch 'master' - Intra-Data Center ECMP testcase This testcase add a scenario in which one extra route can be reachable through two VMs which are in a same network attached to a router which is later associated to a BGPVPN instance. This extra route ip address is different from subnet of VMs. After the extra route is configured with VM ips as nexthops, then when third VM is trying to reach extra route, traffic would split between two VMs. The traffic split can happen only in heavy loaded scenario, so this testcase would test only reachability. JIRA: SDNVPN-23 Change-Id: I4bb4e94f5c98c0f3c22bff7a6998af2a7a919f16 Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
2018-01-15Update git submodulesPeriyasamy Palanisamy1-0/+0
* Update docs/submodules/sdnvpn from branch 'master' - Resync testcase description JIRA: SDNVPN-200 Change-Id: Ida111d28591d99cc8d2a73ec1c14920800354a9b Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
2018-01-15Update git submodulesEddie Arrage1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Update test user guide to improve usability - Modify hosts.yaml syntax to match patch by Serena - Modify result file references for new timestamp patch by Georg - Revise online/offline diagrams for OVP name change - Add XCF GIMP source files for diagrams with layers for new elements - New changes for cvp.0.9.0 to ovp.1.0.0 - Remove reference to bottlenecks container for now - Modify section/heading structure - Incorporate comments: results.json vs. result files - Incorporate comments: online/offline install headings - Incorporate comments: remove IP from launch_db.sh - Incorporate comments: remove sudo for wget - Incorporate comments: pod.yaml for SUT HW info - Incorporate comments: test case to config file requirement - Incorporate comments: suggested changes to env_config.sh - Modify the sequence of the guide to reflect installation steps - Outline all required configuration files earlier in the guide - Highlight configuration file key entries and pitfalls - Improve requirements for pod.yaml file for HA - Improve online/offline install instructions - Call out Dovetail docker run command and explain options - Clarify when testapi and local db ports need to be changed - Explain the dovetail run --testsuite and --testarea arguments more clearly - Improve --report option and default result result behavior - Make CVP portal a separate section - Explain CVP portal workflow to reflect current state of interface - Update references to cvp.0.8.0 with cvp.0.9.0 Change-Id: I41857c1b07c211a95f19c99054ca414351c75c20 Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
2018-01-15Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "update review correction" - update review correction Change-Id: I189026a4b10795dec11dc76571868c733f03d354 Signed-off-by: sgdt6900 <rhanafy.ext@orange.com>
2018-01-15Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Fix GUI" - Fix GUI Change-Id: I909038e8d00c97b9e19c97b13836407649b5dc96
2018-01-15Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "adding tests for the change "interface - pipline"" - adding tests for the change "interface - pipline" Change-Id: I0f302ca240e03f43ffd47822b548721174c37a86 Signed-off-by: sgdt6900 <rhanafy.ext@orange.com>
2018-01-15Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "add test_data unittests for moon_manager" - add test_data unittests for moon_manager Change-Id: I1d3a587ac4d870f5c79a71a8d9100e9e71041743 Signed-off-by: MohamedAssem <mmagraby.ext@orange.com>
2018-01-15Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Add tests to moon_orchestrator and refactor" - Add tests to moon_orchestrator and refactor Change-Id: I666e9c0e89daeb32896169a62c0872719ee04cc8 Signed-off-by: ReemMahmoud <rfawzy.ext@orange.com>
2018-01-15Update git submodulesYang Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Add docs for nose test JIRA: BOTTLENECK-219 This path is to add docs for unit & coverage tests Change-Id: I504cb14cd32828533b5a82f02770e60da785794a Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
2018-01-15Update git submoduleswutianwei1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Fetch kubernetes admin.conf for test from kube_master fetch the admin.conf to the directory /opt/admin.conf of compass-tasks docker Change-Id: I1c236414c968f721d04fb6da0dc7a9514c892f93 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-01-15Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Testcase 084 documentation" - Testcase 084 documentation JIRA: YARDSTICK-906 TC084 is to evaluate the IaaS compute performance by using SPEC CPU 2006 benchmark Change-Id: I628edf1d73e12d9f18eaf9609fa862ca456a1c71 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2018-01-15Update git submodulesRyota Mibu1-0/+0
* Update docs/submodules/doctor from branch 'master' - Merge "fix the pep8 check" - fix the pep8 check Change-Id: I91b8b6cd07d859a1d1abdc25f015a3c3b2756fab Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2018-01-15Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Do not hide unit tests execution fail While moving tests from ./tests/ to ./yardstick/tests, both unit tests directories are executed. If the first test run fails, do not hide the error and exit immediately. Change-Id: Ib6c64ccf2f4b19722722eb43b3d45d5ad5f0169d Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
2018-01-15Update git submodulesTomi Juvonen1-0/+0
* Update docs/submodules/doctor from branch 'master' - Merge "ability to run maintenance test" - ability to run maintenance test JIRA: DOCTOR-119 Change-Id: I98e556fba30eb7ba244cb9d0d88a9e95c39193ff Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
2018-01-15Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/doctor from branch 'master' - Updated from global requirements Change-Id: If61652d0dc7734b4fcc8678cdc425121d0fdd580 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-01-15Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Add a judgement to control the proxy jump configuration" - Add a judgement to control the proxy jump configuration - Set a default value(True) to proxy_jump - For MCP, set proxy_jump to False. Because remote node can be directly connected from qtip container without proxy jump. Change-Id: I92214de984a0231ba4ba873f3a60cb12589ade28 Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2018-01-15Update git submodulesGuo Ruijing1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - remove docker installation during build Change-Id: I2545a17d616426d7cbb2898fa30ad248bb383461 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2018-01-15Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - modify check openstack installation progress Due to the add of 'role' column in host-list check openstack progress shell script has to change the num in filter line Merge after this commit been merged. https://review.openstack.org/#/c/531105/ Change-Id: If089eafeb8b30883f9310ebdc2fe912352031e7f Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2018-01-14Update git submodulesjulien zhang1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "support gen DHA/NETWORK yaml by pdf" - support gen DHA/NETWORK yaml by pdf Change-Id: I8e0d88da016801e7997b4cdf870e2d11b4fca80a Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
2018-01-13Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Build functest-parser for arm64 via travis-ci Even if clearwater-live-test dependencies have been updated [1], the next containers can be built for ARM (ruby raises SEGFAULT via qemu-user-static): - functest-vnf - functest-restapi The related manifest is also updated. [1] https://gerrit.opnfv.org/gerrit/#/c/50295/8 Change-Id: Ie1eb78436a3da5eb7b5c1028b7f8323e8c3e73a2 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-01-13Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - update image for ODL Change-Id: I549cce85155252e0711a9defe38d936ac09dd63f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-13Update git submodulesLaura Sofia Enriquez1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Rollback update.sh Rollback update.sh to test Jenkins Job. Change-Id: I8490c29a6d8f9c5c7c250b5fa025f71d4b754916 Signed-off-by: Laura Sofia Enriquez <lsofia.enriquez@gmail.com>
2018-01-13Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Align example config files to pharos format After [1], get_mac_addresses_for_virtual()'s behavior was changed. So in order to let it to produce right mac_addresses for both pharos's and example's config file, the example config files' format should also be changed accordingly. [1] https://gerrit.opnfv.org/gerrit/#/c/50325/ Change-Id: Ia1ee481057fbe87ab8410c0354c4724bcf013ac4 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "snaps: Disable snaps verify jobs to prevent jobs queueing up" - snaps: Disable snaps verify jobs to prevent jobs queueing up The POD, intel-pod20, where the slave was located doesn't exist anymore so we have no possibility to run snaps-verify jobs for the timebeing. This will be looked into once we have a new slave setup. Change-Id: Ib46ccf160cd6895aa65d6a136afeedd2f7300335 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-01-12Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update Pharos Backup Job" - Update Pharos Backup Job Moves the backup location to a directory that Jenkins can write to, and since this only runs a docker container there is no need to clone any repositories. Change-Id: I05b35e5d2d95c7044973d9d0e1a9d7e72c490570 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-12Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - container4nfv: Disable jobs until the project stops changing docker version Container4nfv verify jobs uninstall the installed version of docker and installs the one coming from the distro which is causing issues for the other projects. Builds are disabled until the project fixes this issue. Change-Id: Ibcec9a7d3badf85193bb7115730410bb719949f9 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-01-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[daisy] Retry if download opnfv.bin failed" - [daisy] Retry if download opnfv.bin failed Download from http://build.opnfv.org/artifacts.opnfv.org may fail [1] so we need retry to make CI stable. [1] https://build.opnfv.org/ci/job/daisy-deploy-baremetal-daily-master/374/console Change-Id: I62837038c7f124870814a68e4b87a8e89ba8c58c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2018-01-12Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Fix 'copper' in Gerrit Trigger for Security Scan" - Fix 'copper' in Gerrit Trigger for Security Scan 'copper' was incorrectly listed as 'cooper' in the gerrit trigger for the security scanning job. Fixing this will ensure patchsets against copper are scanned. Change-Id: Ie32148647638612b0da2d810c50dd5c0ea078844 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-12Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Remove Concurrency From JJB Merge Job Currently multiple jjb merge jobs can run at once causing a race-condition which Jenkins exposes as a 401 Unauthorized. Throttling the number of jobs in total to 1 should prevent this from happening in the future. Change-Id: I4c99d9f49db0baf26b3d077354afd2fea93d1740 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-12Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [PDF] lf-pod{2,5}: Revert IPMI creds to plaintext LF PODs IPMI user/pass was previously encrypted with the wrong key, switch them back to cleartext. Change-Id: Iccd106b60d2051acf7d928205bd2f6ae3f256884 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-12Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [PDF] arm-pod6: dos2unix IDF to fix yamllint JIRA: PHAROS-298 Change-Id: Ied56d4e1fdf09d3361de5aae64088e65cb5125ad Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-12Update git submodulesAaron Smith1-0/+0
* Update docs/submodules/barometer from branch 'master' - Merge "docker: influxdb add collectd database" - docker: influxdb add collectd database Change-Id: Ie417439b4fd6f0793925a20d95824c82af4eca7a Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-01-12Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Switch to absolute paths in Dockerfiles" - Switch to absolute paths in Dockerfiles It updates functest-smoke and functest-restapi. Change-Id: If4d48f8a6ead1b9b7726a9b7b7baf6b51340a926 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-01-12Update git submodulesGordon Kelly1-0/+0
* Update docs/submodules/barometer from branch 'master' - docker: rename barometer image and update documentation Rename the barometer image from barometer to barometer-collectd to align with naming convention of other barometer images and move relevant files to new barometer-collectd directory.Docker userguide also updated accordingly Change-Id: Id866baf41bc38d3db8575ee00abfc64e97c7259b Signed-off-by: gordonkelly <gordon.kelly@intel.com>
2018-01-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Delete the updated Alpine image It completes "Update Alpine to 3.7" [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/49741/ Change-Id: If836a7ca80f5869c9ffeea65a1c0eacf1042ffab Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-01-12Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Retry cinder volume state The service of cinder-volume restarts too quickly after package installation with default/incorrect configuration and goes over restart threshold, so systemd stops attempt to restart any further causing state faulure. To fix it properly the RestartSec (i.e. restart delay) param should be added into cinder-volume.service unit. Change-Id: Ic8591e8ef52a3d439122f276d275e56bd2442ce6 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-01-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/releng from branch 'master' - Remove falsy ;; It completes "Create vnf and restapi images-built job for arm" [1] which introduced a new bug. [1] https://gerrit.opnfv.org/gerrit/#/c/50465/ Change-Id: I45dcc6db65382eeb3280c719cec72c425164ab2f Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-01-12Update git submodulesRHE1-0/+0
* Update docs/submodules/moon from branch 'master' - create moon jenkins Change-Id: I10cac28f45fca917a0a841e1113a9ffb31369f15 Signed-off-by: RHE <rebirthmonkey@gmail.com>
2018-01-12Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Create vnf and restapi images-built job for arm" - Create vnf and restapi images-built job for arm Change-Id: Ife5d1726680db34d5d027cd592510bdd1123a965 Signed-off-by: Linda Wang <wangwulin@huawei.com>