summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2018-08-08Update git submodulesleonwang1-0/+0
* Update docs/submodules/stor4nfv from branch 'master' - Update the latest version of ansible script This patch is proposed for merging the latest version of ansible code according to opensds-installer project. From the latest version code, we change the default installation way from source code to release, which means there is no need for golang environment prepare and long-time building work. Change-Id: I93d7d24f29e61979bc8fda7125ae753063eda423 Signed-off-by: leonwang <wanghui71@huawei.com>
2018-08-07Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - CPERF: Fix CSIT robot suite paths Change-Id: Id40e0d433b0b22bb98f7471af28b6088879c160c Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-07Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - CPERF: CSIT enable all suites Change-Id: Ib95a268ca478338b1358ec63baa1937325ee7a39 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge changes from topics 'baremetal-noha', 'move-maas-classes' * changes: [noha] cinder: Align VG name with HA scenarios [reclass] Move system.single class to common [maas] Add reclass storage definitions for all [reclass] Move MaaS classes to common dir for NOHA - [noha] cinder: Align VG name with HA scenarios Prepare for MaaS integration in NOHA scenarios by aligning cinder VG naming across all scenarios. JIRA: FUEL-382 Change-Id: I0cd7accf573ae0904efddd7aa67d880f2a6deb71 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [reclass] Move system.single class to common Include system.linux.system.single class globally in the common section, preparing for MaaS NOHA node definition. JIRA: FUEL-382 Change-Id: Icdfb2a90f356cd537631abe653950c0c30020551 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [maas] Add reclass storage definitions for all Reclass storage definitions for mas01 node should be added to all ha/noha scenarios, only when/if baremetal cluster nodes are involved. JIRA: FUEL-382 Change-Id: I455b07894b68eb89903df94352159ea6519275b0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [reclass] Move MaaS classes to common dir for NOHA Prepare for reusing MaaS-related reclass classes for NOHA scenarios. JIRA: FUEL-338 Change-Id: Ic8ddd5915563f58643ef8c7ac4055a1000db7d45 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [ha] Bind cinder volume I/O on mgmt network JIRA: FUEL-367 Change-Id: I9a4171d2616af5ae1bafbf1740fd7c7f97c1768e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-07Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Fix swift operator role [1] https://build.opnfv.org/ci/view/functest/job/functest-fuel-armband-baremetal-daily-master/35/console Change-Id: I7236bf5a74f36941f499da32c5c77dcd0b98b6f1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-08-07Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Update Xtesting to 0.55.0 It allows calling one skipped test via run_tests (parallel testing). Change-Id: I04e5c69f2129e28f1451815938cd5d0f8bbe9e44 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-08-07Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Change assert statements to raises in CheckValue" - Change assert statements to raises in CheckValue * Instead of using assert statements, raise a custom exception. * Modify the unit tests so that they do not test unused parameters for equality. * Fix pylint and pep8 errors. JIRA: YARDSTICK-966 Change-Id: I41e13a5a22086827792eaf9de8da2e4ed6dd42de Signed-off-by: Miikka Koistinen <miikka.koistinen@nokia.com>
2018-08-07Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Merge "enable kata container with ovn cni" - enable kata container with ovn cni Change-Id: I3d79c13fca011af83e5c9109319f8f4cc49b8b85 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2018-08-07Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Separate out test_parse_to_value_exception()" - Separate out test_parse_to_value_exception() Separate out test_parse_to_value_exception(self) into 3 different methods:     test_parse_scanner(self)     test_parse_parser(self)     test_parse_reader(self) This ensures that each side effect is tested, even if one fails. JIRA: YARDSTICK-940 Change-Id: Ifdc84284c633fe1ddc1acf9cd985c5144030b430 Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
2018-08-07Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "[workaround] Disable gui for aarch64" - [workaround] Disable gui for aarch64 Currently the aarch64 yardstick image doesn't build because phantomsj and bower don't install properly. Temporarily disable gui for aarch64 only so we can still get the other updates. JIRA: ARMBAND-391 Change-Id: I64f892641c7bdb1cb3a65b210f71b093878b1688 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-08-07Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - CPERF: Open CSIT testing ports in overcloud Port 12345 needs to be open so that a netcat server can respond to client requests. Change-Id: Iaf6e59bcb16a7afe329d522b80d6678e65f10140 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-07Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - Merge "several enhancement/fix for kubeadm onap" - several enhancement/fix for kubeadm onap 1. add ntp for kubeadm onap 2. support vagrant cross 2 hosts 3. add beijing branch Change-Id: I50faf8448ddc0efa765b98fecd19c1d7a52bf3a3 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2018-08-07Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Bugfix: HA test case baremetal down ipmi power off failed - dovetail" - Bugfix: HA test case baremetal down ipmi power off failed - dovetail Test case tc025 baremetal down failed to ipmi power off the node. This patch target to solve: ipmi_password is not correctly fetched JIRA: YARDSTICK-1326 Change-Id: Ia915cd07cba420643fa9a679975178328be55700 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2018-08-07Update git submodulesJamo Luhrsen1-0/+0
* Update docs/submodules/releng from branch 'master' - Override EXT* variables to be in 192.0.2.0/24 Change-Id: I2ee7c37f492f712af3cd10b41ac8bdb6456843db Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com> Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-06Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - CPERF: Add external csit suite Change-Id: Ic2a237149af4cb8d5935a2b018c94b669cf380fe Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-06Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - CPERF: Fix ODL_STREAM to not include 'stable/' CSIT variable needs to be the branch short name. Also, removes duplicate log upload and fixes the upload path to use short name (to avoid '/' in path for branch) Change-Id: I5e1dac15fdbc1eca6c9edaf8b554c3362fd7a558 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-06Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - CPERF: fix OPENSTACK_TOPO arg Change-Id: Ib12228bf149649ab8466906b2e6acea44111e954 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-06Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Apex: add bgpvpn scenarios to daily" - Apex: add bgpvpn scenarios to daily Change-Id: I4039dba21e2c74bfecafbcc5dd04880ab6bea0a2 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-06Update git submodulesRicardo Noriega1-0/+0
* Update docs/submodules/apex from branch 'master' - Revert "Fix BGPVPN Queens scenario files to be consistent" This reverts commit b88eb3c7a1578cb251282c358fad6d87e7439868. Change-Id: If5a2548e647de099229824761c6c575ca4f2e815 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - u/fuel: Bump for keyserver patch rebase (3) Change-Id: Ifb6bc76a66ae9d932c7b8de049b271d6a30e8ebc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[lib.sh] Reset virtual nodes after MaaS install" - [lib.sh] Reset virtual nodes after MaaS install For hybrid PODs (e.g. x86_64 jumpserver + control nodes, aarch64 baremetal compute nodes), the virtual nodes rely on MaaS DHCP to be up when the OS boots, so issue a `virsh reset` accordingly. Instead of checking for online nodes using `test.ping`, use `saltutil.sync_all` to also sync Salt state modules to the virtual nodes (usually handled by baremetal_init state in HA deploys). JIRA: FUEL-338 Change-Id: If689d057dc4438102c3a7428a97b9638e21bfdc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06Update git submodulesVenkata Harshavardhan Reddy Allu1-0/+0
* Update docs/submodules/sfc from branch 'master' - formatting the log message in odl_utils.py #413 Change-Id: I32f826fbb2c0a339264b8b316666ddf7f241570c Signed-off-by: Venkata Harshavardhan Reddy Allu <venkataharshavardhan_ven@srmuniv.edu.in>
2018-08-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [patch] Rebase keyserver patch for disabled repos Rebase patch on top of upstream commit [1]. [1] https://github.com/salt-formulas/salt-formula-linux/commit/45cf452d Change-Id: Id44eab58150ff69140f630352a299633cdb4f4ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Change juju_epc cidr juju cannot bootstrap if cidr already exists which now happens only if a shared network with the same cidr is defined (it should be considered as a bug about juju). By allocation its own cidr, it protects vs remaining rally or tempest remaining shared networks or vs parallel testing. juju_epc can already run twice in parallel as it creates a new project and a private network. Change-Id: I76c4971d631f763307315478e6cf5a383c91ed36 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-08-06Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "use 'workspace-cleanup' plugin in publisher" - use 'workspace-cleanup' plugin in publisher Change-Id: I4db7c0cda5485dbc756a22b9cbde298612241274 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2018-08-06Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "clean the workspace in the publisher" - clean the workspace in the publisher As doctor run tox under root user, we need to clean the workspace in the publisher, otherwise the tests which come next will be fail when they operate in the workspace with jenkins user. Change-Id: I14fbabc7516153c6d93e53baf106067ff4194af6 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
2018-08-05Update git submodulesJamo Luhrsen1-0/+0
* Update docs/submodules/releng from branch 'master' - Use TOPO, not TOPOLOGY Change-Id: I86453397a6039c130281de83571489380fc0e309 Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
2018-08-04Update git submodulesJamo Luhrsen1-0/+0
* Update docs/submodules/releng from branch 'master' - Change OS_DEPLOY to OPENSTACK_TOPO Change-Id: Ie9c2e9418dc7a2c8d6fcc798a9132303401a1128 Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
2018-08-04Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Make synchronous Shade calls It makes difficult to find the issues (floating ip, boot, ssh connection, etc...) for a small benefit regarding the current testcase implementations. It increases the default floating ip timeout because it has been reached when running Functest multiple times in parallel. It may be the root cause when running singlevm vs XCI (in that case, neutron api and agents are hosted in a nested vm). Change-Id: Ia97e04902321644c207c59987283754318aee5e5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-08-04Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - u/fuel: Bump & rebase for OVN HA scenario Change-Id: I4538c6cd74874fdb2c0b00c40bfe85cc1921a8b1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03Update git submodulesCristina Pauna1-0/+0
* Update docs/submodules/releng from branch 'master' - Reschedule the armband jobs Make the jobs run more often as we need more results in CI with the approach to MS5 and the release Change-Id: I7d868b004ebdb9dee5122d3cd92504290a7ce5f2 Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-08-03Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add UT: ArithmeticRunner worker normal operation" - Add UT: ArithmeticRunner worker normal operation * Use time.sleep to avoid multiprocessing.Queue broken pipe error. JIRA: YARDSTICK-1245 Change-Id: I0176c062f44830804ddbeebeb012afc1f9e20d41 Signed-off-by: Miikka Koistinen <miikka.koistinen@nokia.com>
2018-08-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [lib.sh] Support older jumpserver libvirt `virsh undefine` argument `--nvram` is only supported by newer versions of libvirt. Although this is mandatory for AArch64, for x86_64 this is not a blocker (since we don't enable OVMF for the VMs on the jumpserver). Change-Id: I3a82bc54b36228980a41d77a463a7558a685c03d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03Update git submodulesDelia Popescu1-0/+0
* Update docs/submodules/functest from branch 'master' - Setup tempest_smoke images for arm64 Configure the images to be used for tempest_smoke testcase for ARM JIRA: ARMBAND-395 Change-Id: Ia13507d70fd05ef541a5154886d52fa388731cee Signed-off-by: Delia Popescu <delia.popescu@enea.com>
2018-08-03Update git submodulesRicardo Noriega1-0/+0
* Update docs/submodules/apex from branch 'master' - Fix BGPVPN Queens scenario files to be consistent Change-Id: Id5b932246020676e1e53438db689e32bc124939e Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [states] openstack_ha: Retry rabbitmq state For hybrid deployments, the first run of rabbitmq:server sls might lead to 'no response' and a retry of the whole `openstack_ha` state. JIRA: FUEL-338 Change-Id: I7ec663f9babc8c55d2c8a2b31a6e674452f04166 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[ha] AArch64: Add missing GPG key for armband repo" - [ha] AArch64: Add missing GPG key for armband repo In a regular baremetal HA scenario, all cluster nodes are provisioned via MaaS, which also adds the Enea GPG key to the APT keyring. However, for a hybrid deployment, virtual nodes are not provisioned by MaaS, so the GPG key should be added to reclass pillar data explicitly for Salt to be able to import it. JIRA: FUEL-338 Change-Id: I333b7c373bdbc631c0f54ac549f97ab889dec77c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add unit test file for ArithmeticRunner" - Add unit test file for ArithmeticRunner * Initial test: test ArithmeticRunner._run_benchmark called arguments JIRA: YARDSTICK-1245 Change-Id: Id18c36bd1345052863ab777bf899c00fe66fd713 Signed-off-by: Miikka Koistinen <miikka.koistinen@nokia.com>
2018-08-03Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "IXIA: Add IP random range `seed` configuration option" - IXIA: Add IP random range `seed` configuration option Added IP random range `seed` configuration option into IXIA traffic profile. JIRA: YARDSTICK-1364 Change-Id: Ic050b6cc48ea75ac6d0470bf7ec1b188649811e1 Signed-off-by: Sosyak, Myronx <myronx.sosyak@intel.com> Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
2018-08-03Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add UDP ports configuration to IXIA traffic profile" - Add UDP ports configuration to IXIA traffic profile - Implemented handling of UDP source and destination ports from IXIA traffic profile. - UDP ports can be defined as a single value or as a random range. Ports range is configured with two parameters 'fixed_bits' and 'mask_bits'. - For example '8-48' range definition will create a repeatable pattern of four values that fall within the range of 8 and 56. JIRA: YARDSTICK-1363 Change-Id: I0ace722f6be843ea79c3d3f4de22cb8fa5669d4f Signed-off-by: Myron Sosyak <myronx.sosyak@intel.com> Signed-off-by: Pshyk Serhiy <serhiyx.pshyk@intel.com> Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
2018-08-03Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Change AutoConnectSSH to return error code by default" - Change AutoConnectSSH to return error code by default AutoConnectSSH execute method always returns exception when remote command returns non 0 ret code. This behavior has been introduced by https://gerrit.opnfv.org/gerrit/#/c/58579/ changes which break the NSB functionality. There are 200+ places where return code (event non zoro) is expected to be returned by AutoConnectSSH.execute() method. Right now the method returns always exception in case of remote command return not zero which causes the problem. Changed execute() method to have previous behavior (raise_on_error is always False by default) and the exception is raised only in case if raise_on_error=True is set explicitly. Added UT. JIRA: YARDSTICK-1365 Change-Id: Ib067583ea5eb704b9174084b45b920c24eb307ac Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
2018-08-03Update git submodulesAaron Smith1-0/+0
* Update docs/submodules/barometer from branch 'master' - Merge "Enable write_redis plugin for barometer-collectd" - Enable write_redis plugin for barometer-collectd This change is to enable write_redis plugin in collectd due to DMA local-agent is going to use the plugin. Change-Id: I522b41278bb020a48f33ac18f4ad08351e51ca36 Signed-off-by: Tomofumi Hayashi <tohayash@redhat.com>
2018-08-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [patch] Rebase keyserver support for update logic Change-Id: Iad2502e876600ba966a38f2df3e71bd579f80e8f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03Update git submodulesRicardo Noriega1-0/+0
* Update docs/submodules/apex from branch 'master' - Enable BGPVPN for master deployments - Injection of Quagga tarball via overcloud builder. - Extraction and installation of all related packages. - It uses SDNVPN artifact repository to download Quagga tarball, so there is only one source to test. - Modifies bgpvpn scenario files to use OS master branch, ODL master branch and containers. JIRA: APEX-627 Change-Id: Icdbc2853d9531048e23fd6d5e444bd68208d18fc Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-03Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Fix timeout (switch to synchronous calls)" - Fix timeout (switch to synchronous calls) It completes "Switch create_server timeout to default value" [1] which forbids waiting more that 180s (create_server was asynchronous). [1] https://gerrit.opnfv.org/gerrit/#/c/60423/2 Change-Id: Icbf9ee48024fe9e10571c2bb7ca895d5828fb561 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-08-03Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Protect VMTP vs cidr conflicts It now runs vtmp via a new admin member. Else it fails due to cidr already used. It only creates a router and both tenant networks are still created by VMTP. Change-Id: I05ed41a3b7a01ee97c720176c404929bf8ea97a0 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> - Fix typo (ressources) Change-Id: Ibe131e0cf02493f0f3a82c1e179848605bd0a292 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-08-03Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Dovetail] using correct rabbitmq process name" - [Dovetail] using correct rabbitmq process name Using the correct process name for the rabbitmq server in the HA test configuration. Change-Id: I42c8ba093f34c5d15f8c2e19b69538b22b716637 Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
2018-08-03Update git submodulesHarry Huang1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Add network_odl.yml for baremetal pod" - Add network_odl.yml for baremetal pod JIRA: - 1. add network_odl.yml for huawei-pod1 and huawei-pod2 2. change br-provider to br-int for network_odl.yml Change-Id: Id116d8f67b99d05a7be913787873048a543b2e2c Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-08-03Update git submodulesdongwenjuan1-0/+0
* Update docs/submodules/doctor from branch 'master' - bugfix: fix the filename of ssh tunnel The stunnel will be setup failed in the docker if we have the .log at the end of file name. Change-Id: I272a9fa3b668d49b0e26752403ad41a67dcfedc7 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>