diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-06-24 04:11:57 +0100 |
|---|---|---|
| committer | andy <github@anarkystic.com> | 2010-06-24 04:11:57 +0100 |
| commit | e3b6e0537eadad7587d68aa144e35743bd8a6dcf (patch) | |
| tree | 4b5af95855568a0bb74cfc7a19ca9dc0de9a4718 /nova | |
| parent | 79549993f658c054a519d36d0b9a7c822802c69c (diff) | |
fix more casing errors and make attachment set print
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/endpoint/cloud.py | 2 | ||||
| -rw-r--r-- | nova/volume/storage.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 2c848103d..281d4d272 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -262,7 +262,7 @@ class CloudController(object): volume.get('node_name', None), volume.get('instance_id', ''), volume.get('mountpoint', '')) - if volume['status'] == 'attached': + if volume['attach_status'] == 'attached': v['attachmentSet'] = [{'attachTime': volume['attach_time'], 'deleteOnTermination': volume['delete_on_termination'], 'device' : volume['mountpoint'], diff --git a/nova/volume/storage.py b/nova/volume/storage.py index c9d9d382a..f52252f2d 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -165,11 +165,11 @@ class Volume(datastore.RedisModel): vol['availability_zone'] = FLAGS.storage_availability_zone vol["instance_id"] = 'none' vol["mountpoint"] = 'none' - vol['attachTime'] = 'none' + vol['attach_time'] = 'none' vol["create_time"] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) vol['status'] = "creating" # creating | available | in-use - vol['attachStatus'] = "detached" # attaching | attached | detaching | detached - vol['deleteOnTermination'] = 'False' + vol['attach_status'] = "detached" # attaching | attached | detaching | detached + vol['delete_on_termination'] = 'False' vol.save() vol.create_lv() vol.setup_export() |