Skip to content

Commit

Permalink
Volumes API uses underscores for attribute formats
Browse files Browse the repository at this point in the history
* Fixes bug 943053

Change-Id: I1dc23b3b910ec2871672a79b9665eb9c517dd4b6
  • Loading branch information
bcwaldon committed Mar 22, 2012
1 parent d6d083c commit 082797b
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"snapshots": [
{
"id": "3fbbcccf-d058-4502-8844-6feeffdf4cb5",
"displayName": "snap-001",
"displayDescription": "Daily backup",
"volumeId": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
"display_name": "snap-001",
"display_description": "Daily backup",
"volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
"status": "available",
"size": 30,
"createdAt": "2012-02-29T03:50:07Z"
"created_at": "2012-02-29T03:50:07Z"
},
{
"id": "e479997c-650b-40a4-9dfe-77655818b0d2",
"displayName": "snap-002",
"displayDescription": "Weekly backup",
"volumeId": "76b8950a-8594-4e5b-8dce-0dfa9c696358",
"display_name": "snap-002",
"display_description": "Weekly backup",
"volume_id": "76b8950a-8594-4e5b-8dce-0dfa9c696358",
"status": "available",
"size": 25,
"createdAt": "2012-03-19T01:52:47Z"
"created_at": "2012-03-19T01:52:47Z"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<snapshots xmlns="http://docs.openstack.org/volume/api/v1">
<snapshot id="3fbbcccf-d058-4502-8844-6feeffdf4cb5"
displayName="snap-001"
displayDescription="Daily backup"
volumeId="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
display_name="snap-001"
display_description="Daily backup"
volume_id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
status="available"
size="30"
createdAt="2012-02-29T03:50:07Z" />
created_at="2012-02-29T03:50:07Z" />
<snapshot id="e479997c-650b-40a4-9dfe-77655818b0d2"
displayName="snap-002"
dislayDescription="Weekly backup"
volumeId="76b8950a-8594-4e5b-8dce-0dfa9c696358"
display_name="snap-002"
display_description="Weekly backup"
volume_id="76b8950a-8594-4e5b-8dce-0dfa9c696358"
status="available"
size="25"
createdAt="2012-03-19T01:52:47Z" />
created_at="2012-03-19T01:52:47Z" />
</snapshots>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"snapshot": {
"id": "3fbbcccf-d058-4502-8844-6feeffdf4cb5",
"displayName": "snap-001",
"displayDescription": "Daily backup",
"volumeId": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
"display_name": "snap-001",
"display_description": "Daily backup",
"volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
"status": "available",
"size": 30,
"createdAt": "2012-02-29T03:50:07Z"
"created_at": "2012-02-29T03:50:07Z"
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<snapshot xmlns="http://docs.openstack.org/volume/api/v1"
id="3fbbcccf-d058-4502-8844-6feeffdf4cb5"
displayName="snap-001"
displayDescription="Daily backup"
volumeId="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
display_name="snap-001"
display_description="Daily backup"
volume_id="521752a6-acf6-4b2d-bc7a-119f9148cd8c"
status="available"
size="30"
createdAt="2012-02-29T03:50:07Z" />
created_at="2012-02-29T03:50:07Z" />
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
"volumes": [
{
"id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
"displayName": "vol-001",
"displayDescription": "Another volume.",
"display_name": "vol-001",
"display_description": "Another volume.",
"size": 30,
"volumeType": "289da7f8-6440-407c-9fb4-7db01ec49164",
"volume_type": "289da7f8-6440-407c-9fb4-7db01ec49164",
"metadata": {"contents": "junk"},
"availabilityZone": "us-east1",
"snapshotId": null,
"availability_zone": "us-east1",
"snapshot_id": null,
"attachments": [],
"createdAt": "2012-02-14T20:53:07Z"
"created_at": "2012-02-14T20:53:07Z"
},
{
"id": "76b8950a-8594-4e5b-8dce-0dfa9c696358",
"displayName": "vol-002",
"displayDescription": "Yet another volume.",
"display_name": "vol-002",
"display_description": "Yet another volume.",
"size": 25,
"volumeType": "96c3bda7-c82a-4f50-be73-ca7621794835",
"volume_type": "96c3bda7-c82a-4f50-be73-ca7621794835",
"metadata": {},
"availabilityZone": "us-east2",
"snapshotId": null,
"availability_zone": "us-east2",
"snapshot_id": null,
"attachments": [],
"createdAt": "2012-03-15T19:10:03Z"
"created_at": "2012-03-15T19:10:03Z"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
size="30"
volume_type="289da7f8-6440-407c-9fb4-7db01ec49164"
availability_zone="us-east1"
createdAt="2012-02-14T20:53:07Z">
created_at="2012-02-14T20:53:07Z">
<metadata>
<meta key="contents">junk</meta>
</metadata>
Expand All @@ -21,5 +21,5 @@
size="25"
volume_type="96c3bda7-c82a-4f50-be73-ca7621794835"
availability_zone="us-east2"
createdAt="2012-03-15T19:10:03Z" />
created_at="2012-03-15T19:10:03Z" />
</volumes>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"volume": {
"id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
"displayName": "vol-001",
"displayDescription": "Another volume.",
"display_name": "vol-001",
"display_description": "Another volume.",
"size": 30,
"volumeType": "289da7f8-6440-407c-9fb4-7db01ec49164",
"volume_type": "289da7f8-6440-407c-9fb4-7db01ec49164",
"metadata": {"contents": "junk"},
"availabilityZone": "us-east1",
"snapshotId": null,
"availability_zone": "us-east1",
"snapshot_id": null,
"attachments": [],
"createdAt": "2012-02-14T20:53:07Z"
"created_at": "2012-02-14T20:53:07Z"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
size="30"
volume_type="289da7f8-6440-407c-9fb4-7db01ec49164"
availability_zone="us-east1"
createdAt="2012-02-14T20:53:07Z">
created_at="2012-02-14T20:53:07Z">
<metadata>
<meta key="contents">junk</meta>
</metadata>
Expand Down

0 comments on commit 082797b

Please sign in to comment.