summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2017-08-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "MaaS: DHCP iprange fix: use dynamic, not reserved" - MaaS: DHCP iprange fix: use dynamic, not reserved Without the 'type' parameter set to 'dynamic', MaaS was configured to reserve the IP range instead of allocating it dynamically. This led to IP exhaustion warnings in MaaS dashboard, as well as wrongful IP allocation. Change-Id: I1f2b90bf4cd2393cfab6d4bc17771cef009701c0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesTaseer Ahmed1-0/+0
* Update docs/submodules/apex from branch 'master' - Small correction in docs. Change-Id: Iec9a401759de5953d4a8ca05c4f1c32b163343ba Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
2017-08-18Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/snaps from branch 'master' - Specify segmentation_id when creating network When the network_type is vlan, it is necessary to specify physical_network and segmentation_id. JIRA: FUNCTEST-863 Change-Id: I44f57cdd825ee3cde7adb946c4f8dc78e3ee5212 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-08-18Update git submodulesMark Beierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Merge "Trying different GPG keyserver" - Trying different GPG keyserver Change-Id: I3226bb30afe5980e544b11498e676c9941b9e2c9 Signed-off-by: mbeierl <mark.beierl@dell.com>
2017-08-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - maas.region: Add port to all MaaS API URLs Change-Id: I6ecc81cc6faf45f33882666b9f537a3e42ad379e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - maas.region: Add missing port to maas_url Change-Id: Iae9991f9148ac518696f9f8b57b5a8ca9dded730 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Enable patchset verification for xci This job gets triggered when a new patchset to xci is created. Currently only the deployment is run and healthcheck will be activated once xci is adjusted for functest. Change-Id: I3ea61524de6c6b5e2d872f59bb362d9c9be6053c Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - linux.network: Fix noifupdown in linux/map.jinja Previous changes attempted to add 'noifupdown' support, but failed to spell it correctly. Fix the typo and also edit the 'maas' state to use simple `salt state.apply` instead of `cmd.run 'salt-call'`. Change-Id: If9889dee896fa100febe0372fe2c4173fc223ee3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - Merge "check if maas exist the only delete pod." - check if maas exist the only delete pod. Change-Id: Id7a75e7edee830913174689a458fccb7522e6639 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-18Update git submodulesMartin Kulhavy1-0/+0
* Update docs/submodules/joid from branch 'master' - Move help usage information to beginning of script If user requests the usage information (e.g. with `--help` argument), the information should be displayed right away. Currently the script first runs updates and installs of dependencies, which can take very long time. Change-Id: If5a75a98876ddeeb580764d823a11331ee8e9faf Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
2017-08-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: Rebase after salt control image update Change-Id: I362ae48d576b14c87188e88599e0a0542028dcb2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - MaaS node: Fix dhcp_interface config Explicitly configure dhcp_interface for mas01, in order to allow the interface name to be parametrized via "dhcp_interface" _param. Change-Id: I6a2750adc1941c0aa1f94ac9b39133b5bd2388c6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Fix summary in run_tests.py" - Fix summary in run_tests.py It fixes summary() when several tests have not been executed after a blocking test in failure. Change-Id: I3c0af4c8083ffa76f786756d409c09e018bbecc8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-08-18Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Apply network config on kvm nodes * re-assign ip from interface to bridge - install bridge utils - make a reboot straight away after network config * change image source for vcp Change-Id: I34506ee161337b5d3a4088cfdf3c082d99ccb695 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-18Update git submodulesJuha Kosonen1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Put domain name in CONST" - Put domain name in CONST Domain name is not obtained in source_rc_file() but used in the patch https://gerrit.opnfv.org/gerrit/#/c/39109/. Change-Id: Iceaf352f7ad5e15f15906f0e3aa1c5ab5ae30a42 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-18Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Sync the kolla version with the upstream" - Sync the kolla version with the upstream Please see https://review.openstack.org/#/c/494347/ in openstack/daisycloud-core. Change-Id: I9f8ed06b8d2baef6b27562920722c76f4d01f5b1 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-18Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Add pytest file for prepare/execute.py" - Add pytest file for prepare/execute.py 1.Add pytest file test_execute.py for prepare/execute.py. 2.Change the makedirs mode from 0600 to 0700 for test env. Change-Id: Ie29e9e4b4210b170f448faf4df907e55bff1435f Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-18Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "refactor storperf scripts structure" - refactor storperf scripts structure - Run qtip and storperf containers by docker-compose - Cope the current patch changes into qtip container for verification - Run the script run_storage_qpi.sh for storperf test Change-Id: Ic140fb7531d270b9c62bcd72f5dbc13917534daf Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
2017-08-18Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Fix compute CI job" - Fix compute CI job Change-Id: I86b2638b7e6ba2e8c4c6ba98b4cad8506d9d5c7c Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-08-18Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Switch to blocking: false for ODL in functest-smoke" - Switch to blocking: false for ODL in functest-smoke It completes the previous change vs the former container [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/39271/ Change-Id: Ie0e55e859e550de9ffb30ce1e6f03859e6869332 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-08-18Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove multisite support" - Remove multisite support JIRA: FUNCTEST-866 Change-Id: I55a4416688b2aca0897910cac69b33e154e73095 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2017-08-18Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - Merge "driverctl: Add driverctl binding tool" - driverctl: Add driverctl binding tool Adds driverctl as a binding tool option for dpdk devices. JIRA ticket contains test results to verify it works when using dpdk-devbind or driverctl. JIRA: VSPERF-525 Change-Id: Ia7a6e43a4b6fb3ba21f5d87d601f4ea4b95b7dab Signed-off-by: Christian Trautman <ctrautma@redhat.com>
2017-08-18Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "patches: linux.system.single fixed upstream" - patches: linux.system.single fixed upstream Fixed upstream in [1], drop our patch. [1] https://github.com/Mirantis/reclass-system-salt-model/commit/573be77 Change-Id: Ieeb9b87cac0418d860bbf04e5e8ffd48898a213e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Modify schemas.py" - Modify schemas.py 1. add schemas for elements added recently in deploy.yml 2. remove daisy_ip from required list, prepare for generate it auto 3. add main() function to make this file useful in bash Change-Id: Ic7a3a87305f96b064260967862f976e33cdea294 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-18Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - modified to do error checking Change-Id: I1292f0e6a9ba63965fe13229f11ebfdc914bd7b1 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-18Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "bugfix: testapi is killed because of oom_kill" - bugfix: testapi is killed because of oom_kill if page is not provided, return page 1 to avoid large memory consume, further more to kill testapi: Out of memory: Kill process 30842 (opnfv-testapi) score 519 or sacrifice child Killed process 30842 (opnfv-testapi) total-vm:4739716kB, anon-rss:3974612kB, file-rss:0kB JIRA: RELENG-291 Change-Id: Id0e144c030aee390cc41cff8a48e3c997de4ad84 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-18Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "impl update trust_indicator in scenario" - impl update trust_indicator in scenario Change-Id: I1afe38412926778bc84d178dbbfc3fe0cde15f69 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-08-18Update git submoduleszhihui wu1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Create entry script for CI" - Create entry script for CI Change-Id: I2ff57203d298e33b8c390b59aea9866e1f607e23 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - ci/deploy.sh: yum install --skip-broken Change-Id: I8098eff73ab15fe58cb357db99df76e1bd160652 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - salt.sh: Add "arm64" to bootstrap arch condition Upstream commit [1] broke Salt bootstrap on AArch64, by introducing an architecture condition that is too strict to allow Debian package installation (even if we provide our own repo). Add "arm64" to the list of supported architectures. This needs to be done on the fly, as the bootstrap script is fetched using `curl` from <salt-master-setup.sh>, which is also fetched dynamically using `svn export`. [1] https://github.com/saltstack/salt-bootstrap/commit/caa6d7d Change-Id: I2ff5d56e4d3072a1afe31ab0a400b0b83e2b34a8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - jjb: Remove jobs that belong to multisite Multisite project has been terminated. http://meetbot.opnfv.org/meetings/opnfv-meeting/2017/opnfv-meeting.2017-08-08-12.59.html Change-Id: Ia7c0bc86b2e8696f8c2f1fff3007d681c6e1cb8c Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2017-08-17Update git submodulesMark Beierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Merge "Making the container compliant with the static data and selecting the metrics, report data using flask server instead of Javascript" - Making the container compliant with the static data and selecting the metrics, report data using flask server instead of Javascript To test the static data, just enter the filename in the URL field Now the metrics and the report data are taken from the json dump using the server side(flask server) instead the client side JIRA: STORPERF-194 Change-Id: I6747aa3db30ad30920c2459b9c5eb5a0c1e3539d Signed-off-by: saksham115 <saksham.agrawal@research.iiit.ac.in>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - ci/deploy.sh: Fix opt parse for local_env sourcing Previously, we only accounted for the arguments we were interested in (l:lab, p:pod), which failed in case other (valid) arguments were passed first. Accept all arguments Fuel's <ci/deploy.sh> accepts, so lab/pod are read no matter where they are placed in the command string. Change-Id: I9125a5e70d19b7e1ca905b2572f3c8ceda13025b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesnarindergupta1-0/+0
* Update docs/submodules/joid from branch 'master' - delete pod if exist during maas deployment. Change-Id: Id045671934696ff96d46079c0f1a8e0ea2a172c2 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - fuel-deploy.sh: source local_env from securedlab While at it, revert BRIDGE default value to "pxebr" after recent Fuel rework was merged in [1]. This mechanism will be leveraged by [2]. Partially reverts commit: 68195fd [1] https://gerrit.opnfv.org/gerrit/#/c/38855/ [2] https://gerrit.opnfv.org/gerrit/#/c/39521/ Change-Id: Ic61487384029a7d16547a5035a1f1b34ecbea8d4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesnarindergupta1-0/+0
* Update docs/submodules/joid from branch 'master' - include ODL space in the bundle. Change-Id: I9e25eab9eca7ab1a944cdf9ca83507b7666583b9 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - Baremetal support for MCP on AArch64 NOTE: Armband moves MaaS IPs to x.y.z.2 (from x.y.z.3) due to address overlap with IPMI static IPs residing in the same range. Change-Id: I2fc9539afe921d2704e7f5ff615ccd86d0914b7b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesnarindergupta1-0/+0
* Update docs/submodules/joid from branch 'master' - adding th elong option as command line. Change-Id: Ibe20b737a0ea9a6afc27ae490d8ff1ce6f61a5c0 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-17Update git submodulesDeepak S1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Fix import error in IxNetwork This patch fixes import error related to ixnetwork and do not wait for TG server to start as IXIA is always running :) Change-Id: I49d6b100eadafad75431cb8974605a6faa496f23 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "Bring in baremetal support" - Bring in baremetal support - ci/deploy.sh: fail if default scenario file is missing; - start by copying reclass/classes/cluster/virtual-mcp-ocata-ovs as classes/cluster/baremetal-mcp-ocata-ovs; - add new state (maas) that will handle MaaS configuration; - Split PXE network in two for baremetal: * rename old "pxe" virtual network to "mcpcontrol", make it non-configurable and identical for baremetal/virtual deploys; * new "pxebr" bridge is dedicated for MaaS fabric network, which comes with its own DHCP, TFTP etc.; - Drop hardcoded PXE gateway & static IP for MaaS node, since "mcpcontrol" remains a NAT-ed virtual network, with its own DHCP; - Keep internet access available on first interfaces for cfg01/mas01; - Align MaaS IP addrs (all x.y.z.3), add public IP for easy debug via MaaS dashboard; - Add static IP in new network segment (192.168.11.3/24) on MaaS node's PXE interface; - Set MaaS PXE interface MTU 1500 (weird network errors with jumbo); - MaaS node: Add NAT iptables traffic forward from "mcpcontrol" to "pxebr" interfaces; - MaaS: Add harcoded lf-pod2 machine info (fixed identation in v6); - Switch our targeted scenario to HA; * scenario: s/os-nosdn-nofeature-noha/os-nosdn-nofeature-ha/ - maas region: Use mcp.rsa.pub from ~ubuntu/.ssh/authorized_keys; - add route for 192.168.11.0/24 via mas01 on cfg01; - fix race condition on kvm nodes network setup: * add "noifupdown" support in salt formula for linux.network; * keep primary eth/br-mgmt unconfigured till reboot; TODO: - Read all this info from PDF (Pod Descriptor File) later; - investigate leftover references to eno2, eth3; - add public network interfaces config, IPs; - improve wait conditions for MaaS commision/deploy; - report upstream breakage in system.single; Change-Id: Ie8dd584b140991d2bd992acdfe47f5644bf51409 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesTaseer Ahmed1-0/+0
* Update docs/submodules/storperf from branch 'master' - Support for Docker images on ARM processors. - Usage: docker build --build-arg ARCH=<arch_type> . Change-Id: I9018c627cef05e69492dbdefbe750d72cf98064d Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
2017-08-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - lib.sh: Fix mcp key owner for OPNFV Jenkins jobs In case of non-root deploys (i.e. running `ci/deploy.sh` without sudo), the OPNFV Jenkins slave executes it under a user shell, under a root shell, e.g.: $ sudo sudo -u jenkins bash $ echo $USER jenkins $ echo $SUDO_USER root Adjust lib.sh to only use SUDO_USER when it is not "root". Change-Id: I6dd1c8a5dd3a3b02cfb760818d66e99f49709a5b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-17Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/functest from branch 'master' - Disable temporarily Doctor from Functest The test case is currently failing whatever the scenario/installer It is misleading for some scenarios (e.g. barometer) As it is systematically failing for the moment, it makes more sense to disable the test rather than complexify regex constraints The test case will be reenabled when the following points will be fixed: - Python 3 support (pending question to Release Manager) - packaging OK: pending patches [1] [2] (need merge of [1]) - remove packet installation in run [1] https://gerrit.opnfv.org/gerrit/#/c/38177/ [2] https://gerrit.opnfv.org/gerrit/#/c/38053/ Change-Id: Ic06786f0d516f1702dc44dc521ba8ca810ee76f9 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-08-17Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - Merge "fix cpu model for aarch64 kvm" - fix cpu model for aarch64 kvm CPU mode 'host-model' for aarch64 kvm domain is not supported by hypervisor refer to issue #1673467 (https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1673467) Change-Id: Idad0a4a19a801200b5f87d43e2a62b21833ab6b1 Signed-off-by: Di Xu <di.xu@arm.com>
2017-08-17Update git submodulesshangxdy1-0/+0
* Update docs/submodules/parser from branch 'master' - Support costum datatype definition in parameters Currently, it's only allowed to define standard parameters in the input section, this patch support to define custom datatype in parameters. The patch will be submitted to OpenStack community. JIRA: PARSER-138 Change-Id: Ie83f446958f6daa301382d21d8a32128bf8dffc9 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-08-17Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - cleanup and remove unnecessary code. Change-Id: Idace8f5b31479dbcd8040fc41ee20e3a70b0cc8a Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-08-17Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "add orchestra_clearwaterims testcase" - add orchestra_clearwaterims testcase -rename testcase orchestra_ims to orchestra_openims -add orchestra_clearwaterims testcase -add unit tests Change-Id: I5291f84068915fa15e3fb7b63c5dbd0daec0acca Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de>
2017-08-17Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Use separate timeouts for connection and reading." - Use separate timeouts for connection and reading. Use a short timeout for connection timeout to avoid to slow down testcase when remote recording API is not available and use a longer one to read data from API on successfull connections. Change-Id: I743c02f890059bf55b47cb4240d52fe0741f7cae Signed-off-by: Benoit HERARD <benoit.herard@orange.com>
2017-08-17Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "API proposal for functest" - API proposal for functest 1. Propose a basic framework for API 2. And these functions have been realized: 1) Show environment 2) Prepare Environment 3) Show credentials 4) List all testcases 5) Show a testcase 6) List all tiers 7) Show a tier 8) List all testcases within given tier JIRA: FUNCTEST-843 Change-Id: Ib961446708077b56465eda0052f6d38806b62594 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-08-17Update git submoduleszhouya1-0/+0
* Update docs/submodules/daisy from branch 'master' - use daisy.conf to build pxe server we use the interface of daisyclient to build the pxe server in tempest.py,but we can use the daisy.conf to build the pxe server instead,this is just the optimization of code Change-Id: I7a75d33aa8f80326750d304fa0a881201e956c57 Signed-off-by: zhouya <zhou.ya@zte.com.cn>