You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2015/05/05 15:26:16 UTC
[23/50] cloudstack-ec2stack git commit: Currect test data
Currect test data
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/commit/3f96112f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/tree/3f96112f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/diff/3f96112f
Branch: refs/heads/master
Commit: 3f96112fbbd77c41942358dec247e29b410b143b
Parents: b30b27e
Author: brogand1993 <da...@hotmail.com>
Authored: Sat Aug 9 13:46:57 2014 +0100
Committer: brogand1993 <da...@hotmail.com>
Committed: Sat Aug 9 13:46:57 2014 +0100
----------------------------------------------------------------------
tests/data/valid_create_snapshot.json | 2 +-
tests/data/valid_create_volume.json | 38 +++++++++++++++++++++++
tests/data/valid_create_volume_response.json | 38 -----------------------
tests/data/valid_describe_snapshot.json | 2 +-
tests/data/valid_describe_snapshots.json | 2 +-
tests/disk_offering_tests.py | 2 +-
tests/volume_tests.py | 4 +--
tests/zones_tests.py | 2 +-
8 files changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/data/valid_create_snapshot.json
----------------------------------------------------------------------
diff --git a/tests/data/valid_create_snapshot.json b/tests/data/valid_create_snapshot.json
index f8661cd..5d711da 100644
--- a/tests/data/valid_create_snapshot.json
+++ b/tests/data/valid_create_snapshot.json
@@ -8,7 +8,7 @@
"jobresultcode": 0,
"jobresulttype": "object",
"jobresult": {
- "vmsnapshot": {
+ "snapshot": {
"id": "e0e04b84-6178-49a7-9d2f-a2cc6a82d4e4",
"name": "i-2-12-VM_VS_20140805203303",
"state": "Ready",
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/data/valid_create_volume.json
----------------------------------------------------------------------
diff --git a/tests/data/valid_create_volume.json b/tests/data/valid_create_volume.json
new file mode 100644
index 0000000..79826ba
--- /dev/null
+++ b/tests/data/valid_create_volume.json
@@ -0,0 +1,38 @@
+{
+ "queryasyncjobresultresponse": {
+ "jobprocstatus": 0,
+ "created": "2014-02-25T19:46:35+0000",
+ "cmd": "org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd",
+ "userid": "2edb33ec-95e4-11e3-b2e4-d19c9d3e5e1d",
+ "jobstatus": 1,
+ "jobid": "1f32404b-d067-43e8-8835-4cc1c55d737a",
+ "jobresultcode": 0,
+ "jobresulttype": "object",
+ "jobresult": {
+ "volume": {
+ "size": 10737418240,
+ "diskofferingname": "Custom",
+ "account": "admin",
+ "domainid": "2edae3e4-95e4-11e3-b2e4-d19c9d3e5e1d",
+ "name": "f0e2a699-1196-49bd-90cd-af809f4c32ea",
+ "created": "2014-02-25T19:46:34+0000",
+ "storagetype": "shared",
+ "type": "DATADISK",
+ "tags": [],
+ "domain": "ROOT",
+ "jobstatus": 0,
+ "jobid": "1f32404b-d067-43e8-8835-4cc1c55d737a",
+ "destroyed": false,
+ "state": "Allocated",
+ "diskofferingdisplaytext": "Custom Disk",
+ "isextractable": true,
+ "displayvolume": true,
+ "zoneid": "1e47a2fc-61c7-401c-b90e-416b472ada64",
+ "diskofferingid": "46f0a62e-ba3c-4a49-b619-877a8b2a07ed",
+ "id": "8552cdce-879a-42f3-bdb5-2e7f55a38996",
+ "zonename": "Sandbox-simulator"
+ }
+ },
+ "accountid": "2edb0c28-95e4-11e3-b2e4-d19c9d3e5e1d"
+ }
+}
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/data/valid_create_volume_response.json
----------------------------------------------------------------------
diff --git a/tests/data/valid_create_volume_response.json b/tests/data/valid_create_volume_response.json
deleted file mode 100644
index 79826ba..0000000
--- a/tests/data/valid_create_volume_response.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "queryasyncjobresultresponse": {
- "jobprocstatus": 0,
- "created": "2014-02-25T19:46:35+0000",
- "cmd": "org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd",
- "userid": "2edb33ec-95e4-11e3-b2e4-d19c9d3e5e1d",
- "jobstatus": 1,
- "jobid": "1f32404b-d067-43e8-8835-4cc1c55d737a",
- "jobresultcode": 0,
- "jobresulttype": "object",
- "jobresult": {
- "volume": {
- "size": 10737418240,
- "diskofferingname": "Custom",
- "account": "admin",
- "domainid": "2edae3e4-95e4-11e3-b2e4-d19c9d3e5e1d",
- "name": "f0e2a699-1196-49bd-90cd-af809f4c32ea",
- "created": "2014-02-25T19:46:34+0000",
- "storagetype": "shared",
- "type": "DATADISK",
- "tags": [],
- "domain": "ROOT",
- "jobstatus": 0,
- "jobid": "1f32404b-d067-43e8-8835-4cc1c55d737a",
- "destroyed": false,
- "state": "Allocated",
- "diskofferingdisplaytext": "Custom Disk",
- "isextractable": true,
- "displayvolume": true,
- "zoneid": "1e47a2fc-61c7-401c-b90e-416b472ada64",
- "diskofferingid": "46f0a62e-ba3c-4a49-b619-877a8b2a07ed",
- "id": "8552cdce-879a-42f3-bdb5-2e7f55a38996",
- "zonename": "Sandbox-simulator"
- }
- },
- "accountid": "2edb0c28-95e4-11e3-b2e4-d19c9d3e5e1d"
- }
-}
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/data/valid_describe_snapshot.json
----------------------------------------------------------------------
diff --git a/tests/data/valid_describe_snapshot.json b/tests/data/valid_describe_snapshot.json
index b4888a2..ec18171 100644
--- a/tests/data/valid_describe_snapshot.json
+++ b/tests/data/valid_describe_snapshot.json
@@ -1,7 +1,7 @@
{
"listvmsnapshotresponse": {
"count": 1,
- "vmSnapshot": [{
+ "snapshot": [{
"id": "examplesnapshot",
"name": "i-2-12-VM_VS_20140805203432",
"state": "Ready",
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/data/valid_describe_snapshots.json
----------------------------------------------------------------------
diff --git a/tests/data/valid_describe_snapshots.json b/tests/data/valid_describe_snapshots.json
index 6753646..a1d5ca1 100644
--- a/tests/data/valid_describe_snapshots.json
+++ b/tests/data/valid_describe_snapshots.json
@@ -1,7 +1,7 @@
{
"listvmsnapshotresponse": {
"count": 2,
- "vmSnapshot": [{
+ "snapshot": [{
"id": "9f2f067f-3ae7-427d-95d9-3c338dcbd5a3",
"name": "i-2-12-VM_VS_20140805203432",
"state": "Ready",
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/disk_offering_tests.py
----------------------------------------------------------------------
diff --git a/tests/disk_offering_tests.py b/tests/disk_offering_tests.py
index fcdaca2..3c077ec 100644
--- a/tests/disk_offering_tests.py
+++ b/tests/disk_offering_tests.py
@@ -20,7 +20,7 @@ class DiskOfferingsTestCase(Ec2StackAppTestCase):
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/valid_create_volume_response.json'
+ 'tests/data/valid_create_volume.json'
)
get.return_value.status_code = 200
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/volume_tests.py
----------------------------------------------------------------------
diff --git a/tests/volume_tests.py b/tests/volume_tests.py
index 6e6c5c3..7d56402 100644
--- a/tests/volume_tests.py
+++ b/tests/volume_tests.py
@@ -112,7 +112,7 @@ class VolumeTestCase(Ec2StackAppTestCase):
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/valid_create_volume_response.json'
+ 'tests/data/valid_create_volume.json'
)
get.return_value.status_code = 200
@@ -152,7 +152,7 @@ class VolumeTestCase(Ec2StackAppTestCase):
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/valid_create_volume_response.json'
+ 'tests/data/valid_create_volume.json'
)
get.return_value.status_code = 200
http://git-wip-us.apache.org/repos/asf/cloudstack-ec2stack/blob/3f96112f/tests/zones_tests.py
----------------------------------------------------------------------
diff --git a/tests/zones_tests.py b/tests/zones_tests.py
index 5f0d9e5..13f3331 100644
--- a/tests/zones_tests.py
+++ b/tests/zones_tests.py
@@ -104,7 +104,7 @@ class ZonesTestCase(Ec2StackAppTestCase):
get = mock.Mock()
get.return_value.text = read_file(
- 'tests/data/valid_create_volume_response.json'
+ 'tests/data/valid_create_volume.json'
)
get.return_value.status_code = 200