You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/03/04 05:28:26 UTC
git commit: updated refs/heads/volume-upload to c65dad4
Repository: cloudstack
Updated Branches:
refs/heads/volume-upload fa7ef9581 -> c65dad47e
Added Browser Based Upload Volume Test configurations into Testdata file
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c65dad47
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c65dad47
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c65dad47
Branch: refs/heads/volume-upload
Commit: c65dad47ebba8337b2016997b4685230111902a9
Parents: fa7ef95
Author: sailajamada <sa...@citrix.com>
Authored: Wed Mar 4 09:52:11 2015 +0530
Committer: sailajamada <sa...@citrix.com>
Committed: Wed Mar 4 09:52:11 2015 +0530
----------------------------------------------------------------------
tools/marvin/marvin/config/test_data.py | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c65dad47/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 2f97d5f..a9f1959 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -860,6 +860,27 @@ test_data = {
"http://10.147.28.7/templates/393d3550-05ef-330f-9b8c-745b0e699759.vhd",
"checksum": "",
},
+ "browser_upload_volume": {
+ "VHD": {
+ "diskname": "XenUploadVol",
+ "url": "http://10.147.28.7/templates/rajani-thin-volume.vhd",
+ "checksum": "",
+ },
+ "OVA": {
+ "diskname": "VMwareUploadVol",
+ "url": "http://10.147.28.7/templates/Autoscale_Template/CentOS5.5(64bit)-vmware-autoscale.ova",
+ "checksum": "",
+ },
+ "QCOW2": {
+ "diskname": "KVMUploadVol",
+ "url": "http://10.147.28.7/templates/rajani-thin-volume.qcow2",
+ "checksum": "",
+ },
+ 'browser_resized_disk_offering': {
+ "displaytext": "Resizeddisk",
+ "name": "Resizeddisk",
+ "disksize": 3
+ },
"recurring_snapshot": {
"maxsnaps": 2,
"timezone": "US/Arizona",