summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-02-14Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[fuel] Disable Euphrates triggers" - [fuel] Disable Euphrates triggers Change-Id: I3fd11c6efb13f46ec74a0237a180497397cdfefe Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-14Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Update Dovetail PTL Email Macro" - Update Dovetail PTL Email Macro Let the 'email-dovetail-ptl' macro reflect that Georg Kunz is the new PTL of the dovetail project. Change-Id: I3b3bd53a7c7f146105a719727fd627bf15054aca Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-14Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - xci: Bump OpenStack Ansbile SHAs * Bump up upstream SHAs * With these upstream SHAs, OSA installs neutron-agent container on controller node which would require eth12 interface on controller for establishing vlan provider networks. so adding eth12 interface and linking it with br-vlan over br-vlan-veth link. Change-Id: Iaf7cbe6e41dcfd15ec6527c5a50701f2d05eaad8 Signed-off-by: Markos Chandras <mchandras@suse.de> Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
2018-02-14Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - bifrost: Add ability to pin Ironic-{,client,inspector,inspector-client} SHAs We should pin the SHAs for Ironic components as part of the regular bifrost bump to ensure maximum long term stability. This also bumps the bifrost SHA to the latest available one. Change-Id: Ia66d8ab6566db58e2ddab5134eb8445bd84d2a8f Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-02-14Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - bifrost: Always deploy Ironic from master The Ironic components are currently being installed from PIP but we should install them from the git repo instead so we can always try the latest code from master or the pinned version when such functionality is implemented. Change-Id: I0138c54befe52ed9df8bf617b78e063df3cf8750 Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-02-14Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Fixed comment" - Fixed comment Change-Id: Ib226ef99eed2fda2c7112faf0f0e9339afed90fe Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-02-14Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[docs] Temp dir permission requirements" - [docs] Temp dir permission requirements JIRA: FUEL-342 Change-Id: I35efc993647c63779107d5f5604e58b124cdcf69 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-02-14Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Fixed document for Grafana Port usage" - Fixed document for Grafana Port usage JIRA: YARDSTICK-992 The Grafana port has been changed to 1948 from 3000, as the port 3000 may be not free in some environments. The document still says it uses port 3000, which leads to confusion. Proposed Solution: The document needs to be updated with correct Grafana port number "http://host_ip:1948" Change-Id: I9078783849aec14602585f4d1b3bc293214ae737 Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
2018-02-14Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - NSB: fix test_vpe_vnf.py Change-Id: Ie1da572e2ac00e380b25f8e22f5aa9059dcb5238 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-14Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - NSB: fix pylint warnings in test_tg_ixload Change-Id: Ieb58167d8b20e0de32578b3df105a141507869d5 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-14Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - NSB traffic_profile: fix pylint warnings and return partial also fix unittests Change-Id: Ie3026f5a0df8e690271afb71fe36ac531cbae2a0 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-14Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - constants: fix pylint warnings for OSError IOError and OSError are the same in Python 3? Anyway we want to ignore ENOENT, not EEXIST JIRA: YARDSTICK-1012 Change-Id: Ia75e41fecce505685745e0099669e45f3e82a1be Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-14Update git submodulesEddie Arrage1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Add stop on failure logic and CLI option - Improve test execution control by adding stop on failure flag - Modify test check function to return value regardless of whether report or local file option is employed - Modify run test loop to check for failure after every test case if stop flag set Change-Id: I27a4f3aaaa8b8cb8c52eb3f092f52048980abb44 Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
2018-02-14Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Enable doctor-notification" - Enable doctor-notification The testcase has been expected to work since the nova bug [1] was bypassed [2]. [1] https://bugs.launchpad.net/nova/+bug/1742827 [2] https://gerrit.opnfv.org/gerrit/#/c/52075/ Change-Id: If53da6313381cf69a0093a6677db3d9033fb8f48 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-14Update git submodulesJuha Kosonen1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Only filter boot_server_from_volume_and_delete via scenario" - Only filter boot_server_from_volume_and_delete via scenario It can be safely merged as only joid supports '^os-nosdn-lxd-(no)?ha$' scenarios. It aims at testing all installers in the same way which would have made much sense if another installer supported this scenarios. Change-Id: I145102df3f6394b6fff28590923100e0f1e6cb66 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-14Update git submodulesTomi Juvonen1-0/+0
* Update docs/submodules/doctor from branch 'master' - Add process group so can kill possible hanging subprocesses. This should be workaround before actual fix is done. JIRA: DOCTOR-123 Change-Id: I70fd4ed9d2aa2cc3a6c46e2515062b7acd31ca0a Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
2018-02-13Update git submodulesBryan Sullivan1-0/+0
* Update docs/submodules/ves from branch 'master' - Fix issues with use in Jenkins JIRA: VES-2 Change-Id: I0d05b9aabf0c3ba9d0ec7e49c752586aaee24c33 Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove INSTALLER_IP from Functest" - Remove INSTALLER_IP from Functest It's mandatory for testcases which are out of Functest. Change-Id: Ia5f5134334ad9f69d44409d817616fa9033fae95 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "Adds barbican service to deployment" - Adds barbican service to deployment This service is required for creating encrypted volumes for storage. JIRA: APEX-531 Change-Id: Ied5ea1d6921ef96c1a352dba523d6f37245608e2 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-13Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'master' - Adds openstack-utils to overcloud Package allows user to do openstack-status to see state of services. JIRA: APEX-352 Change-Id: Ie68cad5745786c8764ae20c2d3ad26dd05e5480b Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-13Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Fixes concurrent apex-virtual jobs We were missing concurrent on this job which was preventing parallel execution. Change-Id: I4d1ea62aef2a321220799cebee008f494490886c Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-13Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Attempt to fix apex-virtual parallel execution Remove passing node params and enable global queue scanning. Hopefully this will allow 2 apex-virtual jobs to run at the same time (1 per each slave). Change-Id: I310dbc477e267c302d50599bab2a933ce988dba7 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-13Update git submodulesMaryam Tahhan1-0/+0
* Update docs/submodules/barometer from branch 'master' - docs: update PMU documentation Change-Id: Ib6256df8a7911aa43d86026d6c40d99ba98c971a Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
2018-02-13Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Updates daily scenarios for Fraser Scenario list for Fraser: https://wiki.opnfv.org/display/SWREL/Fraser+Scenario+Status Change-Id: I083dc5b0b9cea9f91d7a9568a05df5865aeafa05 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-02-13Update git submodulesJuha Kosonen1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Test vnf in all os-nosdn-nofeature scenarios" - Test vnf in all os-nosdn-nofeature scenarios It allows setting os-nosdn-nofeature-noha as default value if DEPLOY_SCENARIO is unset. As orchestra* testcases are already disabled, it's useless to ask a specific installer. All vnf testcases should work vs any installer. Change-Id: Ia388f96348f9d06745f8d1669962d7f1c4e47d84 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[centos jump] Add more missing required packages" - [centos jump] Add more missing required packages - gcc is required for NBD kernel module build; - gdisk is required for resizing rootfs in nbd-mounted chroot; Change-Id: I8863c126b75ce3a15998c03d2d159f53f5006f5d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-13Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "Update PTL to Julien Zhang in INFO file" - Update PTL to Julien Zhang in INFO file Includes a link to the TSC notice of PTL change. Change-Id: Ib5ea9abdc9bcfec29c3cb1ab02906221436969f1 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Enhance variable manipulation in rally" - Enhance variable manipulation in rally - utilize env vars directly via os module - use getattr to read CONST JIRA: FUNCTEST-931 Change-Id: I893a91331e26846f8effe2d3d58522950bd096fd Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2018-02-13Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - Merge "loadgen: Support for Stressor-VMs as a Loadgen" - loadgen: Support for Stressor-VMs as a Loadgen This patch adds support for stressor-VMs as a loadgen in VSPERF. The changes include: 1. 07_loadgen.conf: User can specify the stressor-VM specific configuration. It includes, image-name, path, nics, memory, etc. 2. loadgen/stressorvm/stressor_vm.py: This file implement ILoadGenerator interface. It implements all the necessary APIs for starting and stopping the loads. 3. Fixed Pylint Error 4. Removed the network device configuration from qemu-system-x86_64 command as stessor-vm mostly focus on CPU and memory stressing. 5. Moved the creation of loadgen after the VNFs are setup in testcase.py. 6. Fixed copyright issues. 7. Removed python-3 checking. Improved exception handling 8. Set Default loadgen as DummyLoadGen 9. Improved OSError Printing with directory name and error 10. Update the year in license. 2017-2018. JIRA: VSPERF-504 Change-Id: Iad6c0780c184f8e36eddcbcae2a580f41118e8dc Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
2018-02-13Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Temporarily disable doctor-notification It's currently forbidding gating all APEX' scenarios [1] (even os-nosdn-nofeature-* [2]). It will be enabled when it's fixed or when functest jobs are rewritten [3] [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/772/console [2] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/770/console [3] https://gerrit.opnfv.org/gerrit/#/c/51853/ Change-Id: I571c464aabe02f67a9e98ca1ab42d8a7efc672ee Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesChristian Trautman1-0/+0
* Update docs/submodules/vswitchperf from branch 'master' - python34_update: Updated build scripts for Centos and RHEL to python34 Recent patch update to collectd requires new packages that must have python34 as a minimum version available. This updates the build scripts for Centos and RHEL to use scl enabled python34. 1. Adds needed packages to build correctly for Centos and RHEL 2. Changes repo location to pull scl enabled python34 3. Modifies enablement of scl to new package string 4. Updates documentation to reflect change JIRA: VSPERF-558 Change-Id: I52257ecfc6abc2112c30137c1de3ced272f21066 Signed-off-by: Christian Trautman <ctrautma@redhat.com>
2018-02-13Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Update the odl_sfc plugin to use the latest version JIRA: - We have upgraded odl version to nitrogen SR1. So this patch we are going to update the odl_sfc plugin to satisfy the latest odl version. Change-Id: I7342fad58c0ae21f918e27e9d72deae214c2af4e Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-02-13Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Move tests: unit/benchmark" - Move tests: unit/benchmark * Fix pylint errors * Add TODOs Some errors are ignored locally, as they were a symptom of other problems. These issues have been flagged with a TODO, and should be fixed later. Change-Id: I30eb4b0aafe0575d0cddbc946108291f21a98ed8 Jira: YARDSTICK-837 Signed-off-by: Emma Foley <emma.l.foley@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove obsolote env var IS_CI_RUN" - Remove obsolote env var IS_CI_RUN Change-Id: I284e0ec97792620db08005a617f584b81a1eae63 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Read env vars instead of using CONST in API" - Read env vars instead of using CONST in API Also, improve the way of getting env values. JIRA: FUNCTEST-933 Change-Id: Ia66bbaf683df03c2874fafe578b84bb78a4f3fd1 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Export env vars instead of CONST in refstack" - Export env vars instead of CONST in refstack JIRA: FUNCTEST-930 Change-Id: I7f28ee0b9a55c53a11f03509c3f9e8eb37cc43a9 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Improve the way of getting env values" - Improve the way of getting env values It simply reads env vars instead of calling CONST.__getattribute__() Change-Id: If3137f3cfb9f3102388988a82393b9b2f4e99f60 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Improve the way of setting values in CONST" - Improve the way of setting values in CONST Use setattr instead of internal method (__setattr__). It must be completed by patches fixing [1] [2] and [3]. [1] https://jira.opnfv.org/browse/FUNCTEST-930 [2] https://jira.opnfv.org/browse/FUNCTEST-931 [3] https://jira.opnfv.org/browse/FUNCTEST-932 Change-Id: I9558f33f5ed4559b6031d75951d5637c0c0ef8cb Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Fix the config of fixed_network_name in tempest" - Fix the config of fixed_network_name in tempest Change-Id: I58726d0fec5b2da4ea8ac1f9925fe56d2f9d7ce0 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-13Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Simplify functest/cli/commands/cli_env.py CONST shouldn't be used for getting/setting env vars. It adds complexity and may raise side effects. It also removes the obsolete env var CI_DEBUG. Change-Id: I8a8fde0fa781351d5eabd2698ca8aae9dee76fb8 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Export env vars via os.environ in test_openstack_utils.py" - Export env vars via os.environ in test_openstack_utils.py CONST shouldn't be used for getting/setting env vars. It adds complexity and may raise side effects. Change-Id: I8319748dd2f0abb95b82a2f65191cac8ccba7f5e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-13Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Enable invalid-name warnings in tempest modules" - Enable invalid-name warnings in tempest modules Do not suppress pylint invalid-name warnings but conform the naming convention. Change-Id: I324d25b3081fe8a366249559b343c1b9cacadb21 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2018-02-13Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Update Pharos PTL in Email PTL Macro Julien has recently been promoted to PTL of the Pharos project and the macro for emailing the Pharos PTL should reflect this change. Change-Id: Id3f025cd87284d480da892fc999d7379af50ac95 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-02-12Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Create host VMs configuration" - Create host VMs configuration Using xml files deploy the VM's using the virt plugin. This code generates the user-data network-config meta-data and the vm's xml. It also deploys the vm JIRA: YARDSTICK-963 Change-Id: I97f2d20d0ab75a4444b8b8e6fb65e9e463870af7 Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-02-12Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Export env vars via os.environ in test_cli_env.py" - Export env vars via os.environ in test_cli_env.py CONST shouldn't be used for getting/setting env vars. It adds complexity and may raise side effects. Change-Id: Id80a03aff6eb908a792f1d07addaad4770e8d0cb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-12Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Heatstack create: fix str/bytes error in NamedTemporaryFile.write()" - Heatstack create: fix str/bytes error in NamedTemporaryFile.write() we need to use jsonutils.dump_as_bytes for NamedTemporaryFile.write() 2018-02-11 19:15:01,366 [INFO] yardstick.orchestrator.heat heat.py:563 Creating stack 'yardstick-4359f33e' START 2018-02-11 19:15:01,935 [ERROR] yardstick.benchmark.contexts.heat heat.py:317 stack failed Traceback (most recent call last): File "/home/rbbratta/yardstick-upstream/yardstick/yardstick/benchmark/contexts/heat.py", line 313, in deploy timeout=self.heat_timeout) File "/home/rbbratta/yardstick-upstream/yardstick/yardstick/orchestrator/heat.py", line 567, in create stack.create(self._template, self.heat_parameters, block, timeout) File "/home/rbbratta/yardstick-upstream/yardstick/yardstick/orchestrator/heat.py", line 56, in create template_file.write(jsonutils.dumps(template)) File "/home/rbbratta/yardstick_venv3/lib/python3.5/tempfile.py", line 622, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' JIRA: YARDSTICK-1005 Change-Id: I504f23b86119b62f3aea5b83a445b97bf810220c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2018-02-12Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Replace neutron get network id with shade." - Replace neutron get network id with shade. Function get_network_id now uses shade client instead of shade client. Removed redundant function: get_port_id. JIRA: YARDSTICK-890 Change-Id: I6081477fee39fa78131187e65daf3d7d3a9e439f Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
2018-02-12Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Fix pylint errors/warnings in tempest modules" - Fix pylint errors/warnings in tempest modules JIRA: FUNCTEST-913 Change-Id: I37b25bbcf43fb1d6f7de0c815ad49070d1e1af12 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2018-02-12Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Decrease log level in Energy messages Energy could be safely disabled if one env var is missing. No error message should be printed in console [1]. It could be enhanced in a second step to print the reasons (missing or incorrect env vars) instead of the full stack. [1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/766/console Change-Id: I9c405edae16d186f02c632113de1317c89703991 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-12Update git submodulesRyota Mibu1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Doctor: pass project parameter to other job" - Doctor: pass project parameter to other job From the failure log of doctor verify ci, project parameter is not passed to other jobs. see: https://build.opnfv.org/ci/job/doctor-verify-sample-master/33/console Change-Id: I6a53cd609a261d90cdc0e1e10a3d7b05a515349e Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>