upload template enhancement #331

guo1017138 · 2020-08-25T03:12:30Z

Support upload ovf which has no ovf:size specified for each dependency file
ShowUploadProgress can exit whenever task stop, such like cancelled on GUI

Issue still exists: if ovf:size is bigger than real vmdk file size, upload task will hung there and never stop. I don't know how to fix

Close #328

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) [email protected]

Support upload ovf which has no ovf:size specified for each dependency file ShowUploadProgress can exit whenever task stop, such like cancelled on GUI Return status directly for reponse which has no body, such like 416, 400 Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Support upload ovf which has no ovf:size specified for each dependency file ShowUploadProgress can exit whenever task stop, such like cancelled on GUI Return status directly for reponse which has no body, such like 416, 400 Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Didainius · 2020-10-19T05:57:44Z

@guo1017138 ,
Sorry for ignoring you - we have been busy releasing terraform-provider-vcd 3.0.0.
Could you give an attempt to merge latest master and we will try to work through it to get it merged. Although it shows only changelog conflict - in fact it is quite hard to review as the diff is big.

Thanks!

Merge remote-tracking branch 'upstream/master' into upload-enhance Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

guo1017138 · 2020-10-19T06:28:03Z

@Didainius , Thank you. I merged with latest code and there is no conflict now. Please help to review.

govcd/catalog_test.go

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Didainius · 2020-10-22T07:56:08Z

One more:

START: catalog_test.go:298: TestVCD.Test_UploadOvf_withoutVMDKSize
Running: TestVCD.Test_UploadOvf_withoutVMDKSize
catalog_test.go:302:
    checkUploadOvf(vcd, check, vcd.config.OVA.OvaWithoutSizePath, vcd.config.VCD.Catalog.Name, TestUploadOvf+"8")
catalog_test.go:323:
    check.Assert(err, IsNil)
... value *errors.errorString = &errors.errorString{s:"file size didn't match described in ovf: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830/vm-20b41fa7-3212-4faf-9295-045d0bc49783-disk-0.vmdk. Unpacked files for checking are accessible in: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830"} ("file size didn't match described in ovf: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830/vm-20b41fa7-3212-4faf-9295-045d0bc49783-disk-0.vmdk. Unpacked files for checking are accessible in: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830")

FAIL: catalog_test.go:298: TestVCD.Test_UploadOvf_withoutVMDKSize

OVA config:

ova:
  ovaPath: ../test-resources/test_vapp_template.ova
  ovaChunkedPath: ../test-resources/template_with_custom_chunk_size.ova
  ovaMultiVmPath: ../test-resources/vapp_with_3_vms.ova
  ovaWithoutSizePath: ../test-resources/template_without_vmdk_size.ova
``

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

guo1017138 · 2020-10-23T01:22:12Z

One more:

START: catalog_test.go:298: TestVCD.Test_UploadOvf_withoutVMDKSize
Running: TestVCD.Test_UploadOvf_withoutVMDKSize
catalog_test.go:302:
    checkUploadOvf(vcd, check, vcd.config.OVA.OvaWithoutSizePath, vcd.config.VCD.Catalog.Name, TestUploadOvf+"8")
catalog_test.go:323:
    check.Assert(err, IsNil)
... value *errors.errorString = &errors.errorString{s:"file size didn't match described in ovf: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830/vm-20b41fa7-3212-4faf-9295-045d0bc49783-disk-0.vmdk. Unpacked files for checking are accessible in: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830"} ("file size didn't match described in ovf: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830/vm-20b41fa7-3212-4faf-9295-045d0bc49783-disk-0.vmdk. Unpacked files for checking are accessible in: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830")

FAIL: catalog_test.go:298: TestVCD.Test_UploadOvf_withoutVMDKSize

OVA config:

ova:
  ovaPath: ../test-resources/test_vapp_template.ova
  ovaChunkedPath: ../test-resources/template_with_custom_chunk_size.ova
  ovaMultiVmPath: ../test-resources/vapp_with_3_vms.ova
  ovaWithoutSizePath: ../test-resources/template_without_vmdk_size.ova
``

Thank you. It breaks in ova upload while my local ENV are using OVF file only.
But I am wondering why the travis-ci can pass each time? I supposed it shall run the test cased defined one by one.

Didainius · 2020-10-23T04:28:40Z

One more:

START: catalog_test.go:298: TestVCD.Test_UploadOvf_withoutVMDKSize
Running: TestVCD.Test_UploadOvf_withoutVMDKSize
catalog_test.go:302:
    checkUploadOvf(vcd, check, vcd.config.OVA.OvaWithoutSizePath, vcd.config.VCD.Catalog.Name, TestUploadOvf+"8")
catalog_test.go:323:
    check.Assert(err, IsNil)
... value *errors.errorString = &errors.errorString{s:"file size didn't match described in ovf: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830/vm-20b41fa7-3212-4faf-9295-045d0bc49783-disk-0.vmdk. Unpacked files for checking are accessible in: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830"} ("file size didn't match described in ovf: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830/vm-20b41fa7-3212-4faf-9295-045d0bc49783-disk-0.vmdk. Unpacked files for checking are accessible in: /var/folders/h2/c60z324s6219c3hc_w28hbx80000gp/T/govcd237219830")

FAIL: catalog_test.go:298: TestVCD.Test_UploadOvf_withoutVMDKSize

OVA config:

ova:
  ovaPath: ../test-resources/test_vapp_template.ova
  ovaChunkedPath: ../test-resources/template_with_custom_chunk_size.ova
  ovaMultiVmPath: ../test-resources/vapp_with_3_vms.ova
  ovaWithoutSizePath: ../test-resources/template_without_vmdk_size.ova
``

Thank you. It breaks in ova upload while my local ENV are using OVF file only.
But I am wondering why the travis-ci can pass each time? I supposed it shall run the test cased defined one by one.

Sadly travis does not run tests on real env (integration or whatever you call it) because there is on publicly available environment f VCD. It only does some static checks.

guo1017138 · 2020-10-23T09:27:43Z

@Didainius Thanks. Got it.

lvirbalas · 2020-11-16T12:24:23Z

@guo1017138 are you planning to come back with an update, need to know what to do with this PR. Thanks!

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

guo1017138 · 2020-11-17T05:12:09Z

@guo1017138 are you planning to come back with an update, need to know what to do with this PR. Thanks!

Hi @lvirbalas , I didn't notice it conflict again. Now I resolved the conflict and please help to review.

Didainius

My testing passed. Thanks

dataclouder

Some minor changes needed

govcd/catalog.go

govcd/catalog_test.go

govcd/upload.go

lvirbalas

LGTM, thank you for your effort!

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

vbauzys

LGTM. Thank you

Didainius · 2020-11-23T11:39:35Z

@guo1017138 ,
Thanks for PR. It is now merged and has a tag of v2.10.0-alpha.3 before we release official one.

Guo, Larry (NSB - CN/Qingdao) added 2 commits August 25, 2020 14:44

Add change log, resolve confict

6ec3752

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

guo1017138 force-pushed the upload-enhance branch from 91a2fbf to 6ec3752 Compare August 25, 2020 06:49

Guo, Larry (NSB - CN/Qingdao) added 3 commits September 28, 2020 11:06

Add change log, resolve confict

3426517

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Merge from upstream to solve conflict

3bdbf4d

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Resolve confict, sync latest code

6c242a6

Merge remote-tracking branch 'upstream/master' into upload-enhance Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Didainius reviewed Oct 20, 2020

View reviewed changes

govcd/catalog_test.go Outdated Show resolved Hide resolved

add s flag to let . match \n (default false)

735da7d

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Fix file size check if ovf:size missing in OVA content check

de6e4d9

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

Merge remote-tracking branch 'upstream/master' to resolve conflict

85adc06

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

guo1017138 force-pushed the upload-enhance branch from 8cb8302 to 85adc06 Compare November 17, 2020 01:07

Didainius requested review from vbauzys and dataclouder November 18, 2020 10:41

Didainius approved these changes Nov 19, 2020

View reviewed changes

dataclouder suggested changes Nov 19, 2020

View reviewed changes

govcd/catalog.go Outdated Show resolved Hide resolved

govcd/catalog_test.go Outdated Show resolved Hide resolved

govcd/upload.go Outdated Show resolved Hide resolved

lvirbalas approved these changes Nov 19, 2020

View reviewed changes

Minor modificaton according to review comments

02bd995

Signed-off-by: Guo, Larry (NSB - CN/Qingdao) <[email protected]>

guo1017138 requested a review from dataclouder November 20, 2020 02:05

vbauzys approved these changes Nov 20, 2020

View reviewed changes

dataclouder approved these changes Nov 20, 2020

View reviewed changes

Didainius merged commit 4ab150b into vmware:master Nov 23, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

upload template enhancement #331

upload template enhancement #331

guo1017138 commented Aug 25, 2020 •

edited

Loading

Didainius commented Oct 19, 2020

guo1017138 commented Oct 19, 2020

Didainius commented Oct 22, 2020

guo1017138 commented Oct 23, 2020

Didainius commented Oct 23, 2020

guo1017138 commented Oct 23, 2020

lvirbalas commented Nov 16, 2020

guo1017138 commented Nov 17, 2020

Didainius left a comment

dataclouder left a comment

lvirbalas left a comment

vbauzys left a comment

Didainius commented Nov 23, 2020

upload template enhancement #331

upload template enhancement #331

Conversation

guo1017138 commented Aug 25, 2020 • edited Loading

Didainius commented Oct 19, 2020

guo1017138 commented Oct 19, 2020

Didainius commented Oct 22, 2020

guo1017138 commented Oct 23, 2020

Didainius commented Oct 23, 2020

guo1017138 commented Oct 23, 2020

lvirbalas commented Nov 16, 2020

guo1017138 commented Nov 17, 2020

Didainius left a comment

Choose a reason for hiding this comment

dataclouder left a comment

Choose a reason for hiding this comment

lvirbalas left a comment

Choose a reason for hiding this comment

vbauzys left a comment

Choose a reason for hiding this comment

Didainius commented Nov 23, 2020

guo1017138 commented Aug 25, 2020 •

edited

Loading