summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2017-12-12Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - xci: Make it easier to use OpenStack-Ansible stable branches It seems it is desirable for projects to use stable OpenStak-Ansible and OpenStack releases in general. However, merely overriding OPENSTACK_OSA_VERSION doesn't work because role requirements and OpenStack services have to be adapted too. Despite the Documentation warning users about this, seems like nobody remembers to read and do the necessary steps. However, this leads to numerous invalid bug reports due to this stable/master mix. Lets try to help improving this situation by doing all the necessary ground work if we detect that we are using a stable branch. Change-Id: I2ba5d7e7942109973b6a6523aae2c01b65e61fe7 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-12-12Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Adding vFirewall HTTP Traffic Profiles for tests including Concurrency, CPS, TPUT, TPS for 2Ports and 4Ports" - Adding vFirewall HTTP Traffic Profiles for tests including Concurrency, CPS, TPUT, TPS for 2Ports and 4Ports Change-Id: I3c7f047dc6d1545093aed6f64ccaed9f90d85af3 Signed-off-by: Phani Kiran Thaticharla <phani.kiran.thaticharla@intel.com> Reviewed-by: Oscar Medina-Duran <oscar.medina-duran@intel.com> Reviewed-by: Deepak S <deepak.s@linux.intel.com> Reviewed-by: Ross Brattain <ross.b.brattain@intel.com> 
2017-12-12Update git submodulesPhani Kiran Thaticharla1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Adding vFirewall HTTP Traffic Profiles. Modified http_locator location for 64K, 256K, 512K and 1024K concurrency files. The traffic profiles include various http locator image sizes i.e 4K,64K,256K,512K and 1024K The traffic schema is changed to "nsb" from "isb" for all the traffic profiles Change-Id: I012da8daaa880ca80db2d3b08cebd9a73c19cd47 Signed-off-by: Phani Kiran Thaticharla <phani.kiran.thaticharla@intel.com> Reviewed-by: Oscar Medina-Duran <oscar.medina-duran@intel.com> Reviewed-by: Deepak S <deepak.s@linux.intel.com> Reviewed-by: Ross Brattain <ross.b.brattain@intel.com> 
2017-12-12Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Compass] change the trigger time once every two days" - [Compass] change the trigger time once every two days Change-Id: I458d00a57d121c3a712d696ef5f703b527dbe3a0 Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-12-12Update git submodulesgrakiss1-0/+0
* Update docs/submodules/dovetail from branch 'master' - [cvp-web] Add initial CVP Portal homepage content for release JIRA: DOVETAIL-563 The CVP portal homepage needs to be modified to support launch activities. An initial iteration between OPNFV marketing has occurred. Attached is a deck that outlines a basic left navigation menu and home content. We can focus on creating the left navigation and content outlined on slide 7. The links for the left navigation aren't all flushed out. Please leave Release Information/CVP Registry link href's blank for now until we define content for those pages. Change-Id: I84b8cfb996d336ef666d5a5f6aaabc0d5eebc37b Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
2017-12-12Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - heat: allow overriding Heat/Neutron private IP for DPDK tests For some L2/L3 DPDK testcases we need to use a custom IP address space different from what Heat provides. These testcases require port_security_enabled = False so Neutron should allow for unrestricted L2 traffic. This will work because we bind the ports to DPDK and thus don't need DHCP. vnf_0: floating_ip: true placement: "pgrp1" network_ports: mgmt: - mgmt uplink_0: - xe0: local_ip: 10.44.0.20 netmask: 255.255.255.0 downlink_0: - xe1: local_ip: 10.44.0.30 netmask: 255.255.255.0 Also fixup flake8 errors in unittests Change-Id: Id29dfffa692f16fb1f526d208db43e476e2f7830 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-12-12Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Set the ram of flavor 1024" - Set the ram of flavor 1024 The setting of hw:mem_page_size=large indicates larger page sizes for guest RAM, eg., either 2MB or 1GB on x86. When tested on compass, 1GB is required. Change-Id: Iefd2e8ff30e0a496157e0bd118e63ab3c402abab Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-12-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Remove Matthew Lijun as committer" - Remove Matthew Lijun as committer Matthew Lijun moved to a new employer which is not a member to OPNFV requiring Matthew to sign individual CLA. This has not happened over the past weeks which needs us to take action to initiate committer removal process. Change-Id: I17081aaffae72e01e98814defe062accac0a4739 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "AArch64: s/ocata/pike/g in scenario defaults" - AArch64: s/ocata/pike/g in scenario defaults We hard set some repo URLs used for base image pre-building, so bump those to Pike, now that Armband repos for Pike are populated. JIRA: ARMBAND-335 Change-Id: Ibd7267b628985a3c7a33d9d8a93c824077c69f10 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - patches: pharos: Bump & drop upstream patches All our staged patches for Pharos repo are now upstream, so bump the git submodule and remove the patch files. Change-Id: I0d68eb3bdd9abfa286c3640acc1f13ce6100801d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] extend public gateway support" - [fuel] extend public gateway support JIRA: FUEL-305 Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2017-12-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Add MaaS PXE network to installer adapter" - [fuel] Add MaaS PXE network to installer adapter JIRA: FUEL-313 Change-Id: I046ea732e1047f793f1b3bc6f7fc31cfcee9ff40 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/pharos from branch 'master' - Merge "[fuel] Add IDF mappings to installer adapter" - [fuel] Add IDF mappings to installer adapter Change-Id: I3a82ed747d2671510a25e65388c7f73ec760afc3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [fuel] cleanup: Drop infra_compute_*_address Our PDF installer adapter defines 3 unused reclass params that are misleading, so drop them (infra_compute_node{01,02,03}_address). Change-Id: Iedf68bbfa77f3a42572dde30275318c8d04f5eb4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Email a monthly repo archives link to OPNFV Legal" - Email a monthly repo archives link to OPNFV Legal Each month we are asked for a copy of all the repositories for license scanning. Sending out a link to this archive will save them from having to ask. Change-Id: I2f51688049b08a556f6bc8d8b098165c0ba281d8 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] cleanup: Parameterize VCP hostnames" - [baremetal] cleanup: Parameterize VCP hostnames We already define the hostnames in a central location (openstack_init), so use the reclass params instead of hardcodes. Also handle hardcoded hostnames in system.haproxy.proxy.listen and system.mongodb.server.cluster. This will also simplify later changes for novcp scenarios. JIRA: FUEL-310 Change-Id: I2a8b4cd1fcb61a7c63f9047123d985bb688dca0a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] Fixup pike deployment" - [baremetal] Fixup pike deployment * up glusterfs.client state before actual volume usage * handle keystone server state * specify suitable nova packages list for uca repo (consoleproxy vs novncproxy) * upgrade vcp nodes to get proper cryptography library for keystone * align service names for libvirt & glusterfs Change-Id: Iaeb7d147e6d407bbeaec2d40fd81037c939c3fe0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-12-11Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "pod_config: cleanup: Drop infra_compute_*_address" - pod_config: cleanup: Drop infra_compute_*_address Our PDF installer adapter defines 3 unused reclass params that are misleading, so drop them (infra_compute_node{01,02,03}_address). Change-Id: I0ca49b73add543c8f03b14ed4d805ce55f973bb5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Prune docker images on ericsson-build3 This patch removes ericsson-build5 as well since that machine does not exist anymore. Change-Id: I7598e5fff166e29ecf4fcd18bebc6d2e3b9be9ed Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2017-12-11Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Revert "Bring in newer glusterfs for mtime unsplit brain" Since the uca/pike repo has version of 3.11 This reverts commit 8a867449217151f59766a74c6165ffc26c7f50b4. Change-Id: I5cc0d94b4a1b53b987fab03bc20466ee3c3eb8b2 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-12-11Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/snaps from branch 'master' - Set the ram of flavor to 1024 The setting of hw:mem_page_size=large indicates larger page sizes for guest RAM, eg., either 2MB or 1GB on x86. When tested on compass, 1GB is required Change-Id: I22d2fcab190e465dd1c36bc4264c75c724c6f64d Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-12-11Update git submodulesDimitrios Markou1-0/+0
* Update docs/submodules/sfc from branch 'master' - Bump SHAs in OSA roles for Pike release Getting alligned with this patch [0] [0]: https://review.openstack.org/#/c/525471/ Change-Id: I0ecc9c1ddb8f4e32ca660e7daeb1b998555b6a12 Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com>
2017-12-11Update git submodulesThomas Duval1-0/+0
* Update docs/submodules/moon from branch 'master' - Add unittests for moon_authz Change-Id: Ic6ca3f2daa122ab030b29eee45d63fb7eb8abd64
2017-12-11Update git submodulessoumaya1-0/+0
* Update docs/submodules/functest from branch 'master' - vEPC tests with juju as an VNF manager juju_epc testcase validate EPC setup with the help of ABoT which acting as test executor. Functest-abot-epc-bundle deploys OAI charms alongwith mysql and ABoT. JUJU is acting as a VNF manager. Change-Id: I45d7b37f21f6b8c7049ab2bf42a4678e30b67a72 Signed-off-by: soumaya <soumaya.nayek@rebaca.com>
2017-12-11Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - xci: Bump OpenStack Ansible and bifrost SHAs Change-Id: I96c988ef6b303b89a5615c50ef60b45e49584b83 Signed-off-by: Markos Chandras <mchandras@suse.de>
2017-12-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Add Python3 support in functest/ci Change-Id: If13bfaa196b8dfab1e83feb28c5a4719c7acd8c7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-12-11Update git submodulesshangxdy1-0/+0
* Update docs/submodules/parser from branch 'master' - Add dependency for openstackcleint Currently, the ci test result is error after the functest team modified the parser dockerfile. ========= 1/4. Preparing VM image for parser... ========= Download image cirros-0.3.5-x86_64-disk.img... ./functest_run.sh: line 72: openstack: command not found Registe image cirros-0.3.2-x86_64-uec... ./functest_run.sh: line 79: openstack: command not found Clean-up the environment... ./functest_run.sh: line 243: openstack: command not found Delete local image file cirros-0.3.2-x86_64-uec.img after test. Delete local URL image file cirros-0.3.5-x86_64-disk.img after test. ./functest_run.sh: line 275: openstack: command not found Delete user parser's role from project parser ./functest_run.sh: line 283: openstack: command not found Delete user parser ./functest_run.sh: line 290: openstack: command not found Delete project parser ./functest_run.sh: line 295: openstack: command not found ======================={ Parser functest end }========================== it need to add python-openstackclient requirement in parser project. JIRA: PARSER-166 Change-Id: I8b38325c602b508823d36709a93b1dd8739156f9 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-12-11Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] Update openstack version to pike" - [baremetal] Update openstack version to pike Change-Id: If4208e937734df72b10aad259c65a2617ff5e19c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-12-11Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "states: maas: Stop using maas-stable PPA" - states: maas: Stop using maas-stable PPA Currently, Xenial repos provide MaaS 2.2.x, while the PPA bumped it to 2.3.x. Since we switched to 2.3, we observed a rare wrongful state transition from 'Deploying' back to 'Ready'. Drop the PPA, falling back to 2.2 from mainline distro repos. JIRA: FUEL-312 Change-Id: I3daa118059f37cbeca076da685661c28f3a28a97 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-11Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Fix yaml format errors in vnf All Rally yaml files are skipped because they leverage on jinja2. Now last errors are in functest/api directories [1]. [1] https://jira.opnfv.org/browse/FUNCTEST-897 Change-Id: I4d6c9b3b7c1f3602bd51c9cf7e1c5babf581ab82 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-12-11Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] Migrate public bridge to ovs" - [baremetal] Migrate public bridge to ovs Get rid of "ovs-to-linux" links, instead of this setup native ovs bridge for public interface and link it with neutron external bridge. Change-Id: I483881e78f22fc035107a622307d95761c4a5667 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-12-11Update git submoduleszhongjun1-0/+0
* Update docs/submodules/daisy from branch 'master' - Fix some spelling mistakes in docs Change-Id: Ib3412b93dc7862839b4b9293286f70f8082e759d Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-12-11Update git submodulesGuo Ruijing1-0/+0
* Update docs/submodules/container4nfv from branch 'master' - update setup vagrant 1. add copyright 2. don't build box in default Change-Id: I2add34fda56a3d9553fbd5a902ab4e23ad1ab40c Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-12-10Update git submodulesBryan Sullivan1-0/+0
* Update docs/submodules/ves from branch 'master' - AIO and centos deploy support JIRA: VES-2 Change-Id: I9858f824f98362c5d60cd8b8e766f06def8ba7a5 Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
2017-12-10Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - u/fuel: Bump & rebase for prx reboot Note that previously we pinned Fuel@OPNFV master branch commits, starting with this rebase we will strictly follow the stable branch. Change-Id: Ide3439ae3afb670931586701c5df307d16c4d89c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-09Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Delete some unneeded files" - Delete some unneeded files Change-Id: I6bd7372751af70daa9cbb9ebcfb53ab529ce8284
2017-12-09Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Fix some configuration issues" - Fix some configuration issues Change-Id: Ic6e9b442b87c2487793a2b6ca65cadf5e40958a1
2017-12-09Update git submodulesRuan HE1-0/+0
* Update docs/submodules/moon from branch 'master' - Merge "Fix a bug in moon_manager_db" - Fix a bug in moon_manager_db Change-Id: Ib65a89dba04bc4c94913ee8573401fbb0a6f5c7b
2017-12-09Update git submodulesThomas Duval1-0/+0
* Update docs/submodules/moon from branch 'master' - Update script to use it with moon_utilities and moon_db Change-Id: I89b78277a6b00f50a243cd5561280136d6b53942
2017-12-09Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - submodule: pharos: Bump to fix run without eyaml Most Fuel PODs do not use encrypted PDFs, so bump Pharos git submodule to include updated `generate_config.py` to silently skip decryption in case eyaml is not installed. Change-Id: I845a32c7001123a93e38197e0daf53d18c797aed Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-09Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - generate_config.py: Fix running without eyaml If eyaml is not installed or misconfigured, we should output raw encrypted data and throw a warn/error accordingly, instead of bailing out completely. Needed for Fuel deploys on PODs that do not use PDF encryption, e.g. lf-pod2. Change-Id: I2905df11a3cf2f2eb1ab9bfd8bd88619af2cab04 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-08Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "enable dovetail to run on APEX bgpvpn scenario" - enable dovetail to run on APEX bgpvpn scenario Since only APEX has the bgpvpn scenario in Euphrates, enable run dovetail on Apex euphrates scenario os-odl-bgpvpn-ha to test sdnvpn test cases. JIRA: DOVETAIL-568 Change-Id: Ic7c880a5ef911fac17807e19484f937bdaa53e21 Signed-off-by: xudan <xudan16@huawei.com>
2017-12-08Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'master' - Merge "Need to use version 17.08 OpenStack charms for OpenContrail with Ocata" - Need to use version 17.08 OpenStack charms for OpenContrail with Ocata Change-Id: I100d0d6108b9ea094e7daf2583ca64cb79e5c2f6 Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
2017-12-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [baremetal] PDF: Use net_admin for MaaS PXE net While at it, fix another small issue where a variable (parameters__param_opnfv_maas_pxe_address) was used without being populated (defined in 'runtime.yml', which is not read using `parse_yaml`, like the scenario yml or the PDF expanded class, pod_config.yml). JIRA: FUEL-313 Change-Id: Iee88601d5420f55572bf90c8cf330afbedfb2e21 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - patches: pharos: Drop patches merged upstream Also, remove redundant pharos patch that adds prx mgmt IPs: - "Re-assign mgmt network to proxy nodes" as those values are set already (to different values!) by patch: + "extend public gateway support" While at it, `make patches-export` should clean the patch dir first. Change-Id: Ice106e5d48c7b4cd90ffc6af7441199034d4f546 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-08Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Add CentOS 7.4 support for OpenStack Pike" - Add CentOS 7.4 support for OpenStack Pike JIRA: COMPASS-565 After this patch merged, compass can deploy OpenStack Pike on CentOS 7.4. Due to some upstream bugs, we add some fixes in this patch, e.g. add libvirt to os-cinder, remove a useless repo after installing Change-Id: Ibc1e6f1ed103daf2d70a8ae1d7c04f77d1545c41 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2017-12-08Update git submodulesDeepak S1-0/+0
* Update docs/submodules/samplevnf from branch 'master' - Merge "Fix command parser" - Fix command parser Command parser could have been crashing if a wrong core/task was used in pkt_size command. For some other commands both an error and a warning were printed in case of errors. Change-Id: I6648bfca1b5bcde3c6393d49687ed84900326d49 Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
2017-12-08Update git submodulesDeepak S1-0/+0
* Update docs/submodules/samplevnf from branch 'master' - Merge "Fix checks done when changing generator pkt_size" - Fix checks done when changing generator pkt_size Different checks were done when setting the generator pkt_size. In case of wrong pkt_size (e.g. too big) an error was printed but the pkt_size was still set causing a potential corruption. In addition, in case of a packet size incompatible with some of the packet fields (e.g. latency data) PROX was panicing while this should not happen runtime for such an error. Change-Id: Ifa11475bf295aaac7b0255c1bf9b5feed8ef90c4 Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
2017-12-08Update git submodulesXavier Simonart1-0/+0
* Update docs/submodules/samplevnf from branch 'master' - Fix qos statistics Packets dropped by QoS (because queues were full) were erroneously shown as idle cycles. There aee now shown as discarded packets. Change-Id: I01a619de621a3dfbfe11cabef257f9dec311e208 Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
2017-12-07Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Fix path for util script in posca guide Change-Id: I957d2232ceafad45ec40f7f99e9b11629887b059 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>