summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2017-07-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "vnfdgen: replace yaml.load with yaml.safe_load" - vnfdgen: replace yaml.load with yaml.safe_load JIRA: YARDSTICK-760 Change-Id: I145c948c1f08562e12877f5d0fe7e797e9d989f9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add intermediate variable for HA test" - Add intermediate variable for HA test JIRA: YARDSTICK-397 Change-Id: I3489893caa5b8194b63cb844325ec0b2c554aecc Signed-off-by: qiujuan <juan_qiu@tongji.edu.cn>
2017-07-25Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - modfied to take care of OCL deployment Change-Id: I462fbcd4eb04e65117eb5e7690440ce88aa05c9b Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-07-25Update git submodulesMark Beierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Merge "Fixing URL for static files Earlier the static files were being served on /static/ now it has been fixed and are being served on /reporting/js/ and /reporting/css/ for js and css files respectively. JIRA: STORPERF-192" - Fixing URL for static files Earlier the static files were being served on /static/ now it has been fixed and are being served on /reporting/js/ and /reporting/css/ for js and css files respectively. JIRA: STORPERF-192 Change-Id: Ibcce2210de88f2359d011752513fdab9f930ab5b Signed-off-by: saksham115 <saksham.agrawal@research.iiit.ac.in>
2017-07-25Update git submodulesmbeierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Switch Container Base to Alpine Changes the base of StorPerf master docker container to be Alpine based. Compiles FIO statically so no runtime libraries need to be copied to the target VM, just FIO. Change-Id: Ia66dc11442211fc5248103a9f955f48f3186b322 JIRA: STORPERF-174 Signed-off-by: mbeierl <mark.beierl@dell.com>
2017-07-25Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/releng from branch 'master' - Move the defaut openstack to ocata Moving from newton to Ocata openstack for deployment by default. This patch will fix the aboe description. Change-Id: I088dfab923589d50305c8e23356eaf2abe0a062f Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-07-25Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - modified to accomodate OCL Change-Id: Ib8227c4050b51adc2c466511bedf47e45a817db1 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
2017-07-25Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Remove Old Storperf Docker Job This has been replaced by three seperate docker build jobs. Change-Id: Ib82e6e69e631ca0122a2dd8ee7881f22884cae39 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-07-25Update git submodulesMark Beierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Merge "Add BRANCH Argument to Dockerfiles" - Add BRANCH Argument to Dockerfiles This is a requirement for OPNFV CI to build Dockerfiles and allows builds to perform branch specific actions. Change-Id: I46c5c99a74e0c9a235a483a4be32f3bd283e0ccd Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-07-25Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Added validation router is attached to the external network." - Added validation router is attached to the external network. Verifying that the external network's ID is the same as the 'network_id' value in router.external_gateway_info. JIRA: SNAPS-145 Change-Id: I60795c69679f6e439e6e102115e228a65572db52 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-25Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Added keypair config for key file deletion." - Added keypair config for key file deletion. Added KeypairSetting attribute named 'delete_on_clean' which is used to override the keypair creator's logic for deleting its associated public/private key files. JIRA: SNAPS-105 Change-Id: I337db99daa6bf7d4b42e8729a92a4baef5c73140 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-25Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Updated docs." - Updated docs. JIRA: SNAPS-122 Change-Id: I499971ac47c5d6b15d7895f1a7abc3a3e8290b3b Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-25Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Fixed problems when setting the OpenStack project ID. There were several calls to retrieve the project ID that required named parameters which was causing the utility function to always return None. Additionally, when creating the dict() required by the Neutron create API 'body' parameter key 'project_id' is not supported and still uses 'tenant_id'. As these problems should have been found earlier, this patch also extends the tests for networks, subnets, ports, and security groups to use 'tenant_id' rather than 'project_id'. JIRA: SNAPS-143 Change-Id: Ic69e56145ea6070718d821edd22a1d0f9970995d Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-25Update git submodulesTaseer Ahmed1-0/+0
* Update docs/submodules/storperf from branch 'master' - Getting a list of Jobs. JIRA: STORPERF-184 - Remove "required" condition for getting Job. - Update documentation. Change-Id: I4dad1dfdb998c78c9c6620760614a36dd62318ec Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
2017-07-25Update git submodulesDelia Popescu1-0/+0
* Update docs/submodules/functest from branch 'master' - Fix dockerfile patch for aarch64 Patched the patch https://gerrit.opnfv.org/gerrit/#/c/37869/ Fixed some issues regarding spaces in the patch file Change-Id: Ieac4b766e36d274bd044cd4110626b5314ea6556 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
2017-07-25Update git submodulesAakashKT1-0/+0
* Update docs/submodules/joid from branch 'master' - Working bundle, will work on getting etcd getting up Change-Id: I94a7cb1ab6d73a1406b8555cbf4716e2667d58af Signed-off-by: Aakash KT <aakash.kt@research.iiit.ac.in>
2017-07-25Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "update storperf installation in Yardstick" - update storperf installation in Yardstick Storper has updated its installaion step. The former used "nginx.conf" is not required any more. Change-Id: I9edd57ae7cffd3a95990844e6b775616d09132f1 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-25Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "support more parameters in iperf3 testcase" - support more parameters in iperf3 testcase JIRA: YARDSTICK-755 The parameters that iperf3 testcase support now maybe insufficient in some usecase. The test case should support parameters such as: windows size and length of buffer. This work is about adding more parameters that can be specified in options section in the YAML file. Change-Id: Ibc81cd1bbbc6fdd492aa67bd3acee7cd310c87ef Signed-off-by: Ace Lee <liyin11@huawei.com>
2017-07-25Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - dpdk: Support dpdk vhost-user client mode Support of vhost-user client mode has been added for both OVS and VPP. VSPERF configures vhost-user server mode in vswitches by default for backward compatibility. Support of vhost-user server mode is deprecated in OVS and it can be removed in future releases. Once it will happen, we have to change vsperf default behavior to usage of vhost-user client ports at vswitch side. This patch also fixes processing of boolean configuration parameters passed via --test-params option. In the past it was not possible to set boolean value to False through --test-params option. JIRA: VSPERF-517 Change-Id: I65e341f820edd6c720043a4acc74c5140b05db18 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com> Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>
2017-07-25Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Functest] Add huawei-virtual5 for alpine testing" - [Functest] Add huawei-virtual5 for alpine testing Change-Id: I5ce29cbb0786e83fbdf5bd014daf6686ec435562 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-07-25Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Functest needs huawei virtual5 to test alpine" - Functest needs huawei virtual5 to test alpine They want to use jenkins to trigger the build. So it need to add the huawei-virtual5 network*.yml Change-Id: Icb8d5d8f574fbbc4674ab1c61a0e3c0c3325f2d4 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-07-25Update git submodulesJun Li1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[yardstick]Add cacert file in yardstick job for compass master environment" - [yardstick]Add cacert file in yardstick job for compass master environment Compass4nfv in master now enables https, so a cacert file is required when executing openstack command in yardstick container. This patch adds a "cacert_file_ vol" binding to the yardstick container. Change-Id: Id69c3e71de6c73fc7834b3ac03f423e3636377b6 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-25Update git submodulesGuillermo Herrero1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: salt-formulas: Enable Armband formula FIXME: Re-enable apparmor. FIXME: Detect baremetal and re-enable acceleration. Based on old Armband Fuel patches: - install qemu-efi; - install vgabios; - disable apparmor as security driver for libvirt (temporary); - fix missing link for vgabios binary blob; - nova: virt_type=qemu (temporary, until we support baremetal too); - nova: pointer_model=ps2mouse since AArch64 has no USB tablet; - nova: cpu_model=cortex-a57; - nova: libvirt driver: Add ttyAMA0 by default on AArch64; - nova: libvirt driver: Use VGA video type by default on AArch64; Change-Id: I6aa87ac8d1c2f9fe3919b80fd29ab84ccfaa7c38 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-07-25Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "yardstick env influxdb/grafana cmd support centos" - yardstick env influxdb/grafana cmd support centos JIRA: YARDSTICK-714 Currently yardstick env influxdb/grafana command do not support centos. Because we use the gateway ip to get the service of influxdb and grafana. But in centos, we can not access influxdb/grafana service via gateway ip. In this patch, I use docker inspect to get the ip of influxdb and grafana. So these command can support centos. Change-Id: Ie4abcb8048b92d61bc62777dfc362bb29f354b2b Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-25Update git submoduleswutianwei1-0/+0
* Update docs/submodules/releng from branch 'master' - Add parameters for compass CI deployment Change-Id: Ic553f1ae40464cd043c548e7d27017e7b17cbc52 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-07-25Update git submodulesZhijiang Hu1-0/+0
* Update docs/submodules/daisy from branch 'master' - Merge "Sync some patches of bash script to python" - Sync some patches of bash script to python Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-25Update git submodulesroot1-0/+0
* Update docs/submodules/daisy from branch 'master' - when deploy have failed print the api log Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-25Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Fix verification failure caused by connexion version" - Fix verification failure caused by connexion version Change-Id: I68534806c43e0eda69905e6890837dadd31140fe JIRA: QTIP-259 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-07-25Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "delete obsolete run_test.sh" - delete obsolete run_test.sh after switching to tox, run_test.sh is not used now Change-Id: I66d40d6df47652b956f85f022843b60886ce41a2 Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
2017-07-25Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Dynamic Inventory JIRA: COMPASS-556 1. using dynamic ansible inventory 2. modify Class AnsibleInstaller in compass-tasks 3. modify compass conf to support this behavior 4. specify docker image in /deploy/conf/compass.conf 5. remove clusterhost status update in playbook_done.py Change-Id: I04079547c8b251571ae4e5b165d3bf425b8913b7 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2017-07-25Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: virtio: min libvirt 3.x and Qemu 2.6 Expect host virtualization tools (libvirt, qemu) to be recent enough to support modern virtio-net-pci out of box as a default. This allows us to drop some changes and a hack - see [1]: - "model=virtio" implies "model=virtio-net-pci" on libvirt 3.x; - "model=virtio" puts each NIC on a seperate bus, all work now; - modern virtio is automatically used when NIC is on PCIe bus; Revert "p/fuel: lib.sh: Revert to virtio-mmio for PXE net" This reverts commit 4f72e6be436badd2ded546424ec4a304cd6ce5d3. [1] https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg07594.html Change-Id: Iaa7af63846c9d9dca5b7a9be5efa54f8cd56242e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-25Update git submodulesMatthewLi1-0/+0
* Update docs/submodules/releng from branch 'master' - compass: bugfix of conditional steps Change-Id: Ib39afd5df9f0629c8dd3e4ba5ffb023cde5595a1 Signed-off-by: MatthewLi <lijun_1203@126.com>
2017-07-25Update git submodulesRuijing Guo1-0/+0
* Update docs/submodules/openretriever from branch 'master' - Merge "Add yardstick example" - Add yardstick example Change-Id: I7c0d4a8d7957ee5eb0efd39e75c561102fa9e06a Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-07-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add multiqueue support" - Add multiqueue support Problem: Neither OVS nor SRIOV multi-queue is not supported. Guest VM lacks tuning to reach high throughput. Solution: (1) Build SRIOV multi-queue capable guest image by recompiling the igxbevf driver (make CFLAGS_EXTRA=-DIXGBE_ENABLE_VF_MQ install). (2) Change pktgen to send on multiple queues. (3) Add tuning in guest VM (Disable irqbalance and setup vNIC interrupt affinity to vCPUs) Update 1: Takes care comments plus adds unit test cases Update 2: Jenkins reports code coverage 81%, local reports 96%, add more unit test cases Update 3: Manually rebased to adapt to SSH.from_node() Update 4: Takes care comments for vnic_type, vnic_name Change-Id: Ieb15381c653b13697487d095efa4be6c3c49fa42 JIRA: YARDSTICK-619 Signed-off-by: Jing Zhang <jing.c.zhang@nokia.com>
2017-07-25Update git submodulesJun Li1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Bugfix: Add Apex jobs failed because of wrong regex" - Bugfix: Add Apex jobs failed because of wrong regex JIRA: DOVETAIL-470 Bug log: https://build.opnfv.org/ci/job/apex-testsuite-os-nosdn-nofeature-ha-baremetal-master/5/console Can't evaluate expression, false is assumed: groovy.lang.MissingPropertyException: No such property: DEPLOY_SCENARIO for class: Script1 Skipping dovetail-apex-baremetal-proposed_tests-master. Condition was evaluated to false. Change-Id: I8295313a3096b603bd390fdb70d451274a5146bb Signed-off-by: xudan <xudan16@huawei.com>
2017-07-24Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Create Docker Builds for Storperf Dockerfiles Taking advantage of the changes to the way the docker build job is configured, this adds builds for all three dockerfiles in the storperf repository. Change-Id: I88480d8453486e0fd1610b48cdd517751f907d34 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-07-24Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Multiple Dockerfile Builds per Project" - Multiple Dockerfile Builds per Project Instead of defining docker build jobs in terms of projects, we define them in terms of dockerrepos. Each dockerrepo is associated with a specific project and may have a seperate Dockerfile (which defaults to 'Dockerfile' if unspecified), and location for files needed by the Dockerfile (default: 'docker'). This should allow for running multiple docker builds out of a single project repository without having to modify the current docker build scripts. The output of this job configuration should match what is currently in Jenkins. Change-Id: I9089d57a0c7cc56be4225b56e96bec56be258f1f Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-07-24Update git submodulesMark Beierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Merge "Returns all job ID's if queried without ID." - Returns all job ID's if queried without ID. JIRA: STORPERF-184 Change-Id: I631b4adbd830420a3b502e4f2a86a66824c87fcd Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
2017-07-24Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: lib.sh: Use host-passthrough CPU model Fix libvirt 3.x compatibility issues by explicitly setting the CPU model to host-passthrough via virt-install. Change-Id: I0e52cbabb0bf42b36dd2b9b5045dc18878e21884 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-24Update git submodulesTim Irnich1-0/+0
* Update docs/submodules/sdnvpn from branch 'master' - Merge "Add test case 9" - Add test case 9 Development of a new test that checks all nodes and succeeds if all OVS br-int interfaces have fail_mode=secure JIRA: SDNVPN-168 Change-Id: Iff14f60e2d25c1769cdec7cec126425937780eb7 Signed-off-by: panageo2 <panageo@intracom-telecom.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Default OSCreds cacert attribute to False." - Default OSCreds cacert attribute to False. The default of True causes more problems than False when dealing with unsecure and secure (HTTPS) API calls. This was issue was found while testing against the new OPNFV CI test pod running Pike. JIRA: SNAPS-80 Change-Id: I819b4f64fa637bb7ce53c58a7a1164600ff6a3b9 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Fixed potential problems with image creation exceptions." - Fixed potential problems with image creation exceptions. With Glance client v2, it appears that rolling back on image creation error was sending in an OpenStack image object into the delete_image() function where it should have been expecting a SNAPS-OO Image domain object. Also added log messages to help expose other potential issues if this patch does not address the root problem at hand. JIRA: SNAPS-139 Change-Id: I52591ff1d055ddf4eacbbc49b3bc8718285edcfa Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Remove temporary directory created for tests." - Remove temporary directory created for tests. JIRA: SNAPS-140 Change-Id: I9e15ca43f644cc86539bb09a32a59801eb689a29 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new exceptions for security group settings" - Created new exceptions for security group settings Raising SecurityGroupSettingsError in SecurityGroupSettings and SecurityGroupRuleSettingsError in SecurityGroupRuleSettings instead of Exception. JIRA: SNAPS-137 Change-Id: I959ffe9a247dc9adffbef460119ba94ad86fd3f0 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new classes RouterSettingsError & RouterCreationError." - Created new classes RouterSettingsError & RouterCreationError. Raising RouterSettingsError in RouterSettings and RouterCreationError in OpenStackRouter instead of Exception. JIRA: SNAPS-136 Change-Id: I3ba4824ea80ccfc07b1f15959898936d51bca1de Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new class ProjectSettingsError." - Created new class ProjectSettingsError. Raising ProjectSettingsError in ProjectSettings instead of Exception. JIRA: SNAPS-135 Change-Id: I5169dd196775453466ea8d7fe9fa0c8d82b2382a Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulestomsou1-0/+0
* Update docs/submodules/sdnvpn from branch 'master' - Fix log gathering functionality Some fixes on https://gerrit.opnfv.org/gerrit/#/c/37261/ JIRA: SDNVPN-170 Change-Id: I2f396f509181b45bfccb76fbfd904d7591000df9 Signed-off-by: tomsou <soth@intracom-telecom.com>
2017-07-24Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Refactor glance_utils.py v1 image creation." - Refactor glance_utils.py v1 image creation. Replace 4 blocks using named parameters with on call to create() with kwargs. JIRA: SNAPS-141 Change-Id: I1268877a8524bb25a7f605f583ace9602f5a9c1b Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Added and improved flavor creation tests. JIRA: SNAPS-142 Change-Id: I9c3cf5202a551f7b137648e95359f0adeb831101 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-24Update git submodulesRyota Mibu1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "fix the log name of functest result for doctor project" - fix the log name of functest result for doctor project Change-Id: I356036cad510e4fe5550505d46dbf1aea3b11496 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>