summaryrefslogtreecommitdiffstats
path: root/docs/submodules/yardstick
AgeCommit message (Collapse)AuthorFilesLines
2017-09-06Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Addition of Prox NSB tests in yardstick JIRA: YARDSTICK-802 Added Prox L3FWD and Packet buffering tests - The tests supports BM and Openstack Heat - L3FWD tests suports 2 and 4 ports - Packet flow buffering test is a 1 port test - Grafana Dashboards are added TODO: Latency stats are missing in KPI collection Need to invetigate that Coverage if needed! Change-Id: I216a170488d5578622cf8c3748a6277b380f016a Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com>
2017-09-06Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - ansible: update package proxy code re-enable retries Change-Id: I77738250e8aa8de3c8a8a1019093af04ce785ae0 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-06Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Adding NSB documentation for SV and Baremetal" - Adding NSB documentation for SV and Baremetal Change-Id: I6db301b88af67256b52f5d197dfffe3c0719e132 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-06Update git submodulesMartin Banszel1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Add fixes for heat deployed UDP_Replay and TRex - Added a PROTOCOL_MAP to map the protocol names to codes -- the scapy requires the code, it fails if the proto is set e.g. to 'udp' - ip addresses must be str, not unicode -- explicit conversion to str added - removed unittest for setup_vnf_environment in test_tg_trex.py as it is the same function as already tested in test_sample_vnf.py - traffic_profile refactored -- code repetition decreased, unittest adapted Known issues: - there is a an attempt to stop already stopped trex. It fires an exception that stop command is issued on the disconnected client. Change-Id: I87e9029630f48b30e8f5b4f9d88ab3b25fd65f03 Signed-off-by: Martin Banszel <martinx.banszel@intel.com>
2017-09-06Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - nsb_setup: fixup typo Change-Id: I7fcbf0a3c3f21065d82ffb23b5ea8c1e774a1d67 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-06Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "ansible: remove default openrc_file" - ansible: remove default openrc_file when clause is re-evaluated after default Change-Id: I2f9b093a4cb0e2d024f8d6beb935f336ac1df637 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - nsb_setup: pin pip versions for ansible, shade, docker Change-Id: Ia1f1c26becdc776ce664b4ab2fb0254049087318 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - PROX: catch ports stats parse error for some reason port status returned fewer fields, catch this for debug and return empty result dict so test continues and hopefully we get a valid stat read on next call. Change-Id: I54f1a86707d2a00efcb82a7e0239d12f90a6542c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Addition of Prox NSB changes in yardstick" - Addition of Prox NSB changes in yardstick JIRA: YARDSTICK-802 Addition of Prox L2Fwd, MPLS test cases for BM and Heat. updates: Most of tg_prox and prox_vnf were absorbed into the base classes. delete most of ProxDpdkVnfSetupEnvHelper, it is handled by DpdkVnfSetupEnvHelper baseclass use standard _build_pipeline_kwargs methods don't use terminate() use baseclass version add new method kill_vnf that runs pkill -x replace resource_helper.execute() with vnf_execture for dumping stats In order to share code between tg_prox and vnf_prox refactor to have tg_prox hold and wrap a ProxApproxVnf instance and call methods on that class. Do this instead of multiple-inheritance. Implement ProxApproxVnf.terminate() using prox socket command based exit, (stop_all, quit, force_quit). vnf_execute calls resource_helper.execute() which calls socket methods on the sut object. Since tg_prox wraps the VNF object, we can call terminate on the VNF object and it should work correctly. move prox config generation to parent process we need to get core number info from config file inside the TG processes, so we need to generate the config in the parent process so the data is copied to the child during the fork. moved more config file methods to the setup_helper class. we run force_quit after quit, so the socket should already be closed this will trigger socket error, so add _ignore_errors option for vnf_execute to ignore socket errors Fixed the terminate issue. Added MPLS tests. Added TG Stats in_packet/out_packet Fixed compile (pep8) issues Fixed MPLS TG port stats, in/out packets Added Grafana dashboards for L2FWD and MPLS Traffic profiles modified for tolerated loss and precision as per DATS tests. Added unit test case for Mpls Single port test stats collection support. Change-Id: Idd9493f597c668a3bb7d90e167e6a418546106e8 Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - ansible: fix corrupt /etc/fstab boot error Change-Id: I71fdef5deff75cad434bf19f0a7e507c1dcc4ed3 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesMaciej Skrocki1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Introduced ansible playbook to setup NSB. Change-Id: I5865cd50d5fde26e9e9fc265d4385372d668413f Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Adding intel_pmu tools plugin for collectd" - Adding intel_pmu tools plugin for collectd Change-Id: I81ff3d43d209e98188855c8b2eb302835bb5d417 Signed-off-by: Neha Vadnere <neha.r.vadnere@intel.com> Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesDeepak S1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Fix Ixload KPIs collection & hang issues. Change-Id: If679333dc1cb9e041a332fb374c55f72eaab1b28 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-05Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - test_create_keypair: fix op_utils mock and mock paramiko Change-Id: I5c039c0d4f4ba651209c7d5ca4e748f9151b5630 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-02Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - add opnfv_os-odl-nofeature-noha_daily.yaml for odl_l3 to odl rename Change-Id: Ib7cfb36d89551a187f5ee681454e61444a08c585 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-01Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Adding support for updating the count/packetsize for given testcase" - Adding support for updating the count/packetsize for given testcase Change-Id: I3ec1a6d3710d44df5ddac6bd8967d28ad58e8d33 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-01Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - sample_vnf: default to 16GB of 2048Kb hugepages 8192 * 2048kB = 16GB Change-Id: I82bf420794e5174e88cfaea08b9fab0d77c2be7f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-09-01Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Adding vfw scale-up test with ixia as tg" - Adding vfw scale-up test with ixia as tg Change-Id: I4f476d16dd11a12f5ffa9047af78d2236a4fbbc2 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-01Update git submodulesDeepak S1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Adding cgnapt scale-up test with ixia as tg Change-Id: I834d733aff2da5af12db08f4159be2e9c6361aab Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-09-01Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Introduced default values and remove unnecessary ones from ansible code image build code." - Introduced default values and remove unnecessary ones from ansible code image build code. Change-Id: Id711d6fdacaddeafb8550290503d6cb6c814ea70 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-09-01Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Added TC for vFW in heat context with ixia TG" - Added TC for vFW in heat context with ixia TG - added common method to get relative paths - added 'Ixia' APP_NAME Change-Id: I7966798bab71af66d3efbeb1e13b07e8fbb41e88 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-08-31Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Enable update ip headers for given testcase" - Enable update ip headers for given testcase Change-Id: I008b3f09695f5e3f484b39d4e70b83e5942de863 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-08-31Update git submodulesDhaval Patel1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Rabbitmq user fix for collectd After rabbitmq server reset we need to setup user profile so that collectd and rabbitmq can communitcate. This profile should match amqp plugin configuration in collectd. Change-Id: I7eef3617d983d909418d484f8ded9e269d5d715d Signed-off-by: Dhaval Patel <dhaval.r.patel@intel.com>
2017-08-31Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "sample_vnf: run_traffic loop, check if tg_process is alive" - sample_vnf: run_traffic loop, check if tg_process is alive if the tg_process crashes, this loop won't terminate unless we check tg_process.is_alive() wait 1 second before checking in case is_alive needs time to become True Change-Id: Ia0b8fd884dcfeb75ebb8e36caaf1f0b70dab079d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-31Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - _get_ip_flow_range: fix bug with single IP ranges If we have a /32 or for some reason find a range of IPs to use, we can default to the single IP specified on the interface. Change-Id: Ieaa1d57b04e1d57e8cef344d5a53bbca05e7887f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-30Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - ssh: fix unittest race condition os.stat is being called multiple times for some reason we only care that is it called at some point. ====================================================================== FAIL: tests.unit.test_ssh.SSHRunTestCase.test__put_file_sftp tags: worker-1 ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master/.tox/py3/lib/python3.5/site-packages/mock/mock.py", line 1305, in patched return func(*args, **keywargs) File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master/tests/unit/test_ssh.py", line 458, in test__put_file_sftp mock_stat.assert_called_once_with("localfile") File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master/.tox/py3/lib/python3.5/site-packages/mock/mock.py", line 947, in assert_called_once_with raise AssertionError(msg) AssertionError: Expected 'stat' to be called once. Called 3 times. Ran 1209 tests in 2.618s FAILED (id=0, failures=1) error: testr failed (1) + testr failing ====================================================================== FAIL: tests.unit.test_ssh.SSHRunTestCase.test__put_file_sftp tags: worker-1 ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master/.tox/py3/lib/python3.5/site-packages/mock/mock.py", line 1305, in patched return func(*args, **keywargs) File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master/tests/unit/test_ssh.py", line 458, in test__put_file_sftp mock_stat.assert_called_once_with("localfile") File "/home/jenkins/opnfv/slave_root/workspace/yardstick-verify-master/.tox/py3/lib/python3.5/site-packages/mock/mock.py", line 947, in assert_called_once_with raise AssertionError(msg) AssertionError: Expected 'stat' to be called once. Called 3 times. Ran 1 tests in 0.110s FAILED (id=0, failures=1) Change-Id: I73370996e6e0543419eec8ecbe81be424ec15822 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-30Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Fix Scale-up issue in HWLB" - Fix Scale-up issue in HWLB Change-Id: I62e23bf0c9811ecf0eedb1cd8adc8cf541cd4b7e Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-29Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "DRAFT: model: remove vld_id not needed" - DRAFT: model: remove vld_id not needed it seems vld_id is not needed now that we add it in _resolve_topology. Remove it from the model and Heat context first and see what happens Needs testing Change-Id: I30d13c80bd90246ee3be67a2bd3439db45e20bcd Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-29Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "utils: catch SyntaxError during import" - utils: catch SyntaxError during import bad modules can also throw SyntaxError besides ImportError Change-Id: I4fa912505753cba3c06f127105354572b7f5ddd8 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-29Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add common openstack opertation scenarios: router & port" - Add common openstack opertation scenarios: router & port JIRA: YARDSTICK-781 This patch adds some common openstack opertation scenarios Change-Id: Id436a201aa04f8f6b98576e8fbf599ca3654827c Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-28Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Collectd Fixes" - Collectd Fixes This fixes collectd installation as well as configuration: 1) Proxy fix, avoid overriding env proxy if already specified under 'http_proxy' env var and not specified on cmd 2) Install 'libvirt-dev' for 'virt' collectd plugin 3) Using dpdk already downloaded by nsb_setup rather than getting latest , because master branch dpdk is failing while building eal_memory 4) Fix typo while checkout new branch Change-Id: I0cc36f49d48d80f7edc35634dfe77016bd35978a Signed-off-by: Dhaval Patel <dhaval.r.patel@intel.com>
2017-08-28Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Kubernetes context adoption when run in CI" - Kubernetes context adoption when run in CI JIRA: YARDSTICK-801 We need kubernetes test case run in CI. We have one scenario k8-nosdb-lb-noha for kubernetes. But for now, we need to do some adoption in CI script. Also I move check OS_AUTH_URL in heat.py. Change-Id: Iff86caf77fd74e70469ad2dc43f2238097ce0001 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-28Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "DRAFT: update yardstick generic test cases dashboard" - DRAFT: update yardstick generic test cases dashboard current dashboard is obselete and hard to understand add local grafana dashboard automatically import by "yardstick env grafana" update grafana version to latest steady Change-Id: Iffae9170231d3e0867a52a1f6b5e99c4650b7326 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-08-26Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Test case: Fio volume benchmark testcase using job file" - Test case: Fio volume benchmark testcase using job file JIRA: YARDSTICK-791 In some use cases, Fio is used with a job file instead of parameters. This work is about adding support for the job file and add a new test case for volume testing. Change-Id: I312d61bf6e7d95f23eedb0b6487f6103b7d76355 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-26Update git submodulesKubi1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Raise Exception if HA test case failed" - Raise Exception if HA test case failed Change-Id: Ia3677724075c1c1408f50bbfcebd3cbcde251d66 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Create test suite k8-nosdn-lb-noha run with k8s context" - Create test suite k8-nosdn-lb-noha run with k8s context JIRA: YARDSTICK-800 We have k8-nosdn-lb-noha scenario with kubernetes deployment. So we need to add k8-nosdn-lb-noha test suite to run test case. Change-Id: Id6dc73ad999733ddfa2e03673c20f7e92a8250a3 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-26Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "bugfix: tc063 fails to get the correct result in ubuntu node" - bugfix: tc063 fails to get the correct result in ubuntu node Change-Id: If96dc008d898a77445246aa7e9c98fab160626df Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-08-26Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "improve tc055 results" - improve tc055 results Change-Id: Ib1282c75c5f9cdc416bedf5c7a2e2d3f44c737f1 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-08-26Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "improve tc002 to make packet size parameterize" - improve tc002 to make packet size parameterize JIRA: YARDSTICK-793 Change-Id: I95d014ad3d2e19dd2df1f5e72d994da2f44d4544 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-08-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "collectd: disable auto-provision" - collectd: disable auto-provision auto-provision requires Internet access inside the VNF, which may not be the case. Change-Id: I2b5b73e1b80074356943c5e3152c3e6a318f3ca4 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-25Update git submodulesMaciej Skrocki1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Enabling ACL test for provider network. Properly re-using network_type from model. Change-Id: I40180eb53080a360b4099c034038eac67716f8d1 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-08-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Added external versions for vFW and cgnat TCs." - Added external versions for vFW and cgnat TCs. Change-Id: I6778dac0c60f090238ed1f4860470e62a64c7d69 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-08-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "ansible: update dpdk, trex and samplevnf install" - ansible: update dpdk, trex and samplevnf install we now clone samplevnf from git repo made install_samplevnf role that takes as parameter VNF name added ubuntu_server_cloudimg_modify_samplevnfs playbook Change-Id: I5724e3b844b3137542a5c293516893a5c80f5c61 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Trex: fix KPI collection return super result Change-Id: I723a37281da15c1887ae1b3cf91d7e957b1924d1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-25Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add rpm,image directories and SLA options to Livemigration" - Add rpm,image directories and SLA options to Livemigration This patch includes adding of rpm and image directories in addition to scripts directory for execution of live migration test case and SLA options for downtime,totaltime and setuptime. Change-Id: I22747b978aa16b6c3ee9e3cdd05cf77a10207626 Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>
2017-08-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Removed unnecessary image definitions and flavor names." - Removed unnecessary image definitions and flavor names. Change-Id: I13464d997ff9aba09a6cff7d3ff62f29df770a38 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-08-25Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Fixed invalid vfw/vacl rulw config issues" - Fixed invalid vfw/vacl rulw config issues Change-Id: Ib96bc4bec359005e04e4a839846779d918881ba4 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-25Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Test case: add test config file for TC078 and TC079" - Test case: add test config file for TC078 and TC079 Change-Id: I47c6f1bf85caa814f019a8aec446c99bb8d99f0d Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-25Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add function to upload image from local/url in GUI" - Add function to upload image from local/url in GUI JIRA: YARDSTICK-782 As user, we need to upload image from local/url. If upload image from local, user need to choose local image, then we will load it to openstack. If upload image from url, we will download it and load it to openstack. Change-Id: Ia9a42fda15a1dfc91476643635343a2f77a94a6b Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-24Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "add ppm into result of pktgen to make result clear" - add ppm into result of pktgen to make result clear Change-Id: I6649960dc9fbc61c22c9b7434805fc335634960b Signed-off-by: rexlee8776 <limingjiang@huawei.com>