Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-01 06:47:33 +02:00
Code Issues Projects Releases Wiki Activity
8,668 Commits 50 Branches 311 Tags 339 MiB
84bd30c570
Commit Graph

726 Commits

Author SHA1 Message Date
Danfeng Liu (c)
9961d8b0d6 O 
Add notary remove signature test case in nightly

1. Update E2E image Dockerfile for adding notary CLI;
2. Add test case of remove notary signature.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-12-17 21:00:08 -08:00
Ziming
e32649adb4 enhance[cicd] introduce github action for CICD 
In order to replace travis.
Implement 5 CI jobs
- UTTEST
- APITEST_DB
- APITEST_LDAP
- OFFLINE
- UI_UT

Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-12-17 18:36:33 +08:00
Danfeng Liu (c)
364df7a767 Modify robot keyword from press key to press keys 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-12-12 17:01:31 +08:00
danfengliu
6d80803dbb
Merge pull request #10091 from danfengliu/update-e2e-dockerfile-to-latest 
Maintain E2E image Dockerfile
 2019-12-12 14:04:53 +08:00
Danfeng Liu (c)
fb80ef9cb9 Update E2E image Dockerfile 
1. update and docker-compose;
2. Install helm and helm3.
3. dockerd-entrypoint.sh has been modify by commit image manually, so it should be updated.
4. Keyword <Get Matching Xpath Count> is no longer recommended in
library Selenium2Library. After Dockerfile is updated and image is going
to be rebuiled, library Selenium2Library has be updated to 3.0.0, but
not 1.8.0, so keyword must be upgraded.

Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-12-12 10:31:15 +08:00
Steven Zou
7bf9372f32 chore[api]:rename API folder to api 
- update swagger yaml file reference in `Makefile`
- update swagger yaml file reference in `README`
- update swagger yaml file reference in `docs/configure_swagger.md`
- update swagger yaml file reference in `make/photon/portal/Dockerfile`
- update swagger yaml file reference in `tests/swaggerchecker.sh`

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-12-11 17:41:27 +08:00
Wang Yan
2a63382236
Merge pull request #10047 from bitsf/makefile_clean 
optimize the makefile process
 2019-12-05 19:03:19 +08:00
Ziming Zhang
332f88ec8c add make clean 
Change-Id: Ibe806972a19cd69bfd90be051cdc340c4d7c6afb
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-12-05 14:44:07 +08:00
Wenkai Yin(尹文开)
d145f4baf4
Merge pull request #10034 from ywk253100/191128_clean 
Clean up admiral-related code
 2019-12-04 17:33:31 +08:00
Danfeng Liu (c)
7dbe84d9c6 1. Add nightly test case of Robot-Account; 2. In Go Into Repo keyword, filter element should not be clicked since list in loading state, so add some sleep and waiting for the cirlce icon is gone; 3. Move read-only test case in the end of common.robot. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-12-03 14:46:54 +08:00
Danfeng Liu (c)
156b1b0687 As we like to use a local registry for nightly quotas test, so that the sample image will not be update without noticed, so modify quotas test case to use local image for pulling. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-29 14:56:41 +08:00
Yogi_Wang
97e08c50c9 refactor project tab 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-11-29 12:02:08 +08:00
Wenkai Yin
dd2bc0ecef Clean up admiral-related code 
Clean up admiral-related code as it's useless

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-11-28 17:28:54 +08:00
Will Sun
6c7ef36e60
Merge pull request #10005 from AllForNothing/remove-lib 
Move lib into src for better UI building
 2019-11-28 09:47:18 +08:00
danfengliu
82b7e02baf
Merge pull request #10018 from danfengliu/add-loop-for-waiting-completion-of-replication 
[Nightly Test]Add a replication scope keyword for waiting the completion of replication result
 2019-11-27 17:51:37 +08:00
Will Sun
a52b99e180
Merge branch 'master' into remove-lib 2019-11-27 17:44:30 +08:00
Danfeng Liu (c)
1698cc034a Add a replication scope keyword for waiting the completion fo replication result. All replication test case must use this keyword to verify if image was pulled. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-27 15:51:03 +08:00
Daniel Jiang
f25bacc5bc
Merge pull request #10010 from wy65701436/upgrade-golang-1.13 
Bump up golang version to v1.13.4
 2019-11-27 10:35:35 +08:00
sshijun
c692f5c67e Move lib into src for better UI building 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-11-27 09:59:06 +08:00
wang yan
7b664f64f1 Bump up golang version to v1.13.4 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-11-26 19:18:45 +08:00
Danfeng Liu (c)
b7bd34d181 It's a temporary solution for quotas case, after internal registry in service, image size will not change any longer. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-26 15:27:50 +08:00
danfengliu
6d382bdb18
Merge pull request #9982 from danfengliu/add-restrict-xpath-for-go-into-project 
Modify keyword Go Into Project and Quota case
 2019-11-25 18:09:50 +08:00
Danfeng Liu (c)
f0750f73de 1. Add element verification for keyword Go Into Project; Make big loop effective by stop assert in keyword Retry Double Keywords When Error; 2. Quota string verification is too restrictive, make it loose a little. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-25 17:44:15 +08:00
Wang Yan
4121545e46
Merge pull request #9972 from wy65701436/cp-9967 
inject base image version tag when to build offline package
 2019-11-25 14:35:13 +08:00
wang yan
b2b8fd1806 udpate base image to 1.10.0 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-11-22 16:47:32 +08:00
Danfeng Liu (c)
08bedb8376 Add a big loop for keyword Go Into Project to make sure if project was not found, search it again 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-22 15:04:22 +08:00
Danfeng Liu (c)
b8a7598ffa The criteria of keyword Go Into Project is not strong for verify if it's in project repositroy page, so fix this issue by way of 'Retry Double Keywords When Error'. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-22 12:07:20 +08:00
Wang Yan
abfd634644
Merge pull request #9935 from wy65701436/enable-migrator-master 
enable build migrator in master
 2019-11-21 18:51:36 +08:00
Danfeng Liu (c)
6e1f560544 Modify 2 points, 1st is add wait time right after scan all; 2nd is add name length for project name to avoid naming repeatly. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-21 15:12:21 +08:00
wang yan
e5bd87ec5d enable build migrator in master 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-11-20 14:59:35 +08:00
Wang Yan
5c16cbc7b6
Merge pull request #9922 from wy65701436/push-online 
upload online installer with drone
 2019-11-19 17:53:22 +08:00
wang yan
17f126c5f7 upload online installer with drone 
1, upload online installer and signature
2, inject npm registry server when to build offline

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-11-19 17:01:31 +08:00
Danfeng Liu (c)
44b9a8d70a The xpath of repository filter behavior may cause hung-up of repositoy search operation, so change it by the filter in the list column. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-19 14:52:56 +08:00
Danfeng Liu (c)
1a6d9536d6 As the background of clair updated was disabled, and we populate clair db right after harbor deployed with existing data, so all clair relevant test cases should be update as the data of this clair population. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-15 18:08:38 +08:00
Daniel Jiang
2fcd174e4b
Merge pull request #9828 from wy65701436/cii-docker-base 
add base images when to build harbor assets
 2019-11-15 14:24:11 +08:00
Yogi_Wang
e951ceb31c Modify scan now nightly case 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-11-13 10:09:03 +08:00
wang yan
47793e77e3 update base file name ane pass base version to build file 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-11-12 19:12:49 +08:00
sshijun
14364727ae Nightly case for tag-retention 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-11-11 16:58:33 +08:00
Yogi_Wang
58936aae42 Modify nightly case of scanner 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-11-11 13:19:37 +08:00
Daniel Jiang
890dcb915e Bump up Clair to v2.1.0 
This commit fixes #9677

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-11-06 14:16:02 +08:00
Steven Zou
4b335b79d5
Merge pull request #9693 from steven-zou/fix/issue_#9606_update_API_swagger 
update API swagger file
 2019-11-06 11:06:02 +08:00
Steven Zou
0ebeaa10df update API swagger file 
- add scanners mgmt related API
- add scan related API
  - trigger scan
  - get report
  - get log text stream
  - get scan all metrics
- update the scan_overview in the tag getting API
- fix #9606

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-11-05 22:20:14 +08:00
Wang Yan
27cb25cc04
Merge pull request #9400 from ninjadq/inject_certs_to_non_root 
Inject certs to non root
 2019-11-05 14:49:08 +08:00
Wang Yan
5961c4d72a
Merge pull request #9625 from ywk253100/191028_e2e 
Add e2e test case for health check API
 2019-11-05 14:34:36 +08:00
Wang Yan
3f39b0ba4f
Merge pull request #9550 from ninjadq/enable_https_by_default 
Enable https by default
 2019-11-04 16:51:33 +08:00
DQ
a0462f0baa Change the clair container to non root user 
Signed-off-by: DQ <dengq@vmware.com>
 2019-11-04 11:36:39 +08:00
danfengliu
e28aae0c90
Merge pull request #9685 from danfengliu/replication-dest-url-changed 
Modify nightly test case due to replication rule element is modified from selector to input
 2019-11-01 15:23:45 +08:00
Danfeng Liu (c)
d8c49d9834 Replication rule element is modified from selector to input, so nightly test case should be updated. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-11-01 13:08:47 +08:00
Will Sun
1c8105e837
Merge pull request #9663 from AllForNothing/nav-modify 
Modify harbor-shell UI
 2019-11-01 10:26:54 +08:00
sshijun
b4fa143aa4 Modify harbor-shell UI 
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-11-01 09:31:33 +08:00
DQ
873d9f5b82 Enable https by default 
1. Umcomment https related configs
2. Remove the https prepare related thing in ci

Signed-off-by: DQ <dengq@vmware.com>
 2019-10-31 20:58:09 +08:00
Wang Yan
fa784d7514
Merge pull request #9649 from wy65701436/fix-9081 
add ldflags for harbor compiler and linker
 2019-10-31 19:14:16 +08:00
Steven Zou
7b6e83090e create API folder to keep API swagger files 
- create API folder
- move harbor API swagger file to API/harbor
- add scanner adapter open API swagger file to API/scanner
- update protal build Dockerfile
- update swagger explorer build command in Makefile

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-10-30 21:41:03 +08:00
wang yan
253e87d186 inject ldflags for harbor compiler and linker 
1, replace the UIVERSION file with ldflags, which is generarted by make to inject into the UI core.
2, inject additional ldflags for harbor compiler

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-30 18:31:42 +08:00
Wenkai Yin
e20b538141 Add e2e test case for health check API 
Add e2e test case for health check API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-10-29 13:48:06 +08:00
Danfeng Liu (c)
76c5cb85ec Before user keyword Enable Self Reg, explore should be opened and navigate to harbor log in page. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-10-28 17:24:07 +08:00
Danfeng Liu (c)
afdf262ca6 In nightly test case of project members, xpath locator of remove a member is not strong enough for location, it used index of elemment, so it should be update by the meaning of the btn. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-10-28 14:52:24 +08:00
Steven Zou
5c4c04a122
Merge pull request #9602 from heww/upgrade-clair-adapter 
Upgrade clair adapter to v1.0.0
 2019-10-28 12:19:28 +08:00
jwangyangls
e8554b9d66
Merge pull request #9587 from jwangyangls/add-webhook-tests-1.10 
Add webhook nightly case
 2019-10-28 10:05:16 +08:00
He Weiwei
28e0c0693b Upgrade clair adapter to v1.0.0 
1. Upgrade clair adapter to v1.0.0.
2. Make the clair adapter which installed by harbor immutable and using internal registry address.
3. Add support to build clair adapter image from binary.
4. Switch to ScannerPull action when make authorization for the scan request.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-10-26 17:25:36 +00:00
Yogi_Wang
988279cdcb Add webhook nightly case 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-10-25 15:25:32 +08:00
Ziming Zhang
7de8ce7472 add gpg sign 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I32d13be2f5b5f383113582a4b1ad5f74bdc7546b
 2019-10-24 11:38:38 +08:00
jwangyangls
72776ed68c
Merge pull request #9515 from jwangyangls/fix-nightly-words 
Modify the words of setting cli secret
 2019-10-23 11:41:49 +08:00
wang yan
3e826c4e80 update query in the immutable delete manifest middleware 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-22 19:37:20 +08:00
Wang Yan
d503f2a245
Merge pull request #9489 from reasonerjt/bump-up-golang 
Bump up golang to 1.12.12
 2019-10-22 10:54:35 +08:00
Yogi_Wang
7b93e845e1 Modify the words of setting cli secret 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-10-22 10:11:25 +08:00
Daniel Jiang
dbe6ebceec Bump up golang to 1.12.12 
Bump up the golang for compiling the binaries to 1.12.12
This commit also includes some minor changes to Makefile to fix issue in
building the binary files.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-10-21 15:55:58 +08:00
Danfeng Liu (c)
7a7ac09fa0 Currently, self registration was disabled after harbor deployment, so all nightly db.robot test cases failed. To correct this, we should enable self-registration before running db test cases. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-10-21 14:34:34 +08:00
danfengliu
37030e513d
Merge pull request #9467 from danfengliu/modify-quota-error-msg 
Fix nightly test case failure by project quota error message changed
 2019-10-18 16:40:46 +08:00
wang yan
b7e336691d fix drone ci docker compose version out of date 
1, update docker-compose to latest
2, print log when to package offline installer

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-18 13:34:48 +08:00
Danfeng Liu (c)
732eda4196 Project quotas counting result is growing a little bit for unknow reason, images redis size was caculating from 25.8 to 25.9, so error message should be updated. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-10-18 10:30:05 +08:00
Wenkai Yin(尹文开)
97ddff2ac8
Merge pull request #9434 from heww/clair-adapter 
build(clair): internal clair adapter when install with clair
 2019-10-17 16:06:10 +08:00
He Weiwei
8964a8697a build(clair): internal clair adapter when install with clair 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-10-17 12:00:51 +08:00
wang yan
66e9278fef add npm registry when to build offline package in drone CI 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-10-16 11:59:42 +08:00
Danfeng Liu (c)
848002df83 Fix an error in prepary.py in Jenkins upgrade pipeline, which is a 'if' position error in project metadata population. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-10-14 18:11:17 +08:00
Steven Zou
a86afd6ebc Merge branch 'master' into feature/pluggable_scanner_s3_merge 2019-10-12 15:18:06 +08:00
Wang Yan
454a427806
Merge pull request #9239 from danfengliu/project-metadata-verification-in-upgrade-verify-script 
Add project meta data verifcation In nightly migrate pipeline
 2019-10-11 14:05:33 +08:00
Steven Zou
58afd8e14b [stage3] support pluggable scanner 
- implement scan controller
- add scan resource and update role bindings
- update registration model and related interfaces

Signed-off-by: Steven Zou <szou@vmware.com>

- implement scan API to do scan/get report/get log
- update repository rest API to produce scan report summary
- update scan job hook handler
- update some UT cases

- update robot account making content
- hidden credential in the job log

Commnet scan related API test cases which will be re-activate later
fix #8985

fix the issues found by codacy

Signed-off-by: Steven Zou <szou@vmware.com>
 2019-10-11 12:53:02 +08:00
Danfeng Liu (c)
96a271f388 In nightly migrate pipeline, after migration, should check all the data which were populated, for now, project meta data were populated, but were not been verified, so I add these verification in this PR. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-10-11 10:28:02 +08:00
danfengliu
ac0d3c991a Add nightly test case of 'Retag should be forbidden when system configuration read-only mode was set'. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-10-10 17:13:19 +08:00
danfengliu
feeb6fb2d8 1. Nightly test case failed due to more vulnerbility CVE IDs in image redis, so add 2 new CVE IDs in CVE Whitelist test cases. 2. A Keyword parameter error was fixed in this PR. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-10-02 16:43:50 +08:00
danfengliu
f6759a0353
Merge pull request #9289 from danfengliu/add-cve-for-redis 
Add a new CVE ID  for image redis in nightly CVE system and project level whitelist tests
 2019-09-27 22:05:25 +08:00
danfengliu
0ff1ef8766
Merge pull request #9225 from danfengliu/add-retry-for-get-project-Quotas 
Add a keyword 'Retry Keyword When Return Value Mismatch'
 2019-09-27 17:23:38 +08:00
danfengliu
2298b96170 In nightly CVE whitelist tests, there be a new CVE occured in image redis, so add this for test verifcation. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-27 17:20:06 +08:00
He Weiwei
4ce72e37c4 fix(robot): robot account improvement for policies 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-09-27 03:07:58 +00:00
Danfeng Liu (c)
20dc245631 In nightly helm pipeline, test case 'Project Quotas Control Under GC' failed, it should be timing issue that the valuse in UI is not ready, so I add a keyword 'Retry Keyword When Return Value Mismatch' to retry value getting action. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-25 17:02:05 +08:00
danfengliu
1157f129b4 After angular upgrade, in DB.robot, 4 test cases failed at create-a-new-user, the reason is that no sleep between input or click action, some blank was not inputed, so I add retry keyword for those actions. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-24 10:55:38 +08:00
danfengliu
7844ca0a2f
Merge pull request #9214 from danfengliu/add-nightly-test-case-of-retag-under-readonly-mode 
Add id for system configuration repo-readonly-checkbox in UI code
 2019-09-24 10:43:55 +08:00
Danfeng Liu (c)
3c8db37616 Add id for system configuration repo-readonly-checkbox in UI code, and add element locator in robot case. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-23 21:55:27 +08:00
danfengliu
cb5a145f27
Merge pull request #9212 from danfengliu/upgrade-preparev17-for-new-migrate-jenkins-pipeline-add-more-test-data 
commented 2 lines to remove Vulnerability scan all data verification
 2019-09-23 19:00:19 +08:00
danfengliu
7144f23857
Merge pull request #9204 from danfengliu/add-id-for-sign-up-btn 
Modify sign-up button xpath from relative html path to id
 2019-09-23 18:00:51 +08:00
Danfeng Liu (c)
6e4331fb92 In this PR right now, I commented 2 lines to remove a verification, it's because that Vulnerability data is not consistent when migrate harbor from 1.7 to 1.9, I've filed an issue to follow it, once it's fixed, these 2 commented lines will be come back. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-23 16:14:01 +08:00
Danfeng Liu (c)
cca1fab069 Modify sign-up button xpath from relative html path to id, and modify script. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-23 15:40:27 +08:00
Ziming
df625f4ef9
Merge pull request #9177 from bitsf/fix_tag_retention_test 
adjust wait job timeout in test case
 2019-09-23 14:47:05 +08:00
Danfeng Liu (c)
9a147f0999 In nightly test, keyword <Create An New Project> failed after angular upgrade, the OK button in create new project page was clicked, but it's not effective, so I add a retry for OK button click, if the button was not disappeared, script will be clicked again. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-20 16:22:10 +08:00
Ziming Zhang
afe81a8b3b adjust wait job timeout 
Change-Id: I8f32f814158d4a7418c39edb7a781879db17a4d7
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-09-20 16:18:03 +08:00
Danfeng Liu (c)
9e05e6dc74 After angula upraded, all migrate pipelines failed at system setting project creation verification. Keyword of Page Should Contain is not working anymore in new UI, so I choosen a new more precise way of checking the select element value of 'everyone' 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-20 14:55:53 +08:00
Danfeng Liu (c)
5d1913842c Script test case for project quotas, there will be 2 or 3 test cases in this PR, like project quota edit, prject quota functionality. 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-09-18 17:55:25 +08:00
jwangyangls
6dd2ae90a0
Merge pull request #9011 from jwangyangls/upgrade_clarity-2.1 
Upgrade angular from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2
 2019-09-18 10:45:40 +08:00
Yogi_Wang
a7c7a8e675 Upgrade angualr from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2 
Signed-off-by: Yogi_Wang <yawang@vmware.com>

Signed-off-by: Meina Zhou <meinaz@vmware.com>
Signed-off-by: sshijun <sshijun@vmware.com>
 2019-09-18 10:12:20 +08:00