From 4d81110e10e186c3b72a5cc60073a2cba8a98696 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 24 Jun 2010 04:11:55 +0100 Subject: fix modify image attribute typo Conflicts: nova/endpoint/cloud.py --- nova/endpoint/cloud.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nova') diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 9ad5816b4..f14532b97 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -352,7 +352,7 @@ class CloudController(object): "args" : {"instance_id": instance_id, "mountpoint": volume['mountpoint']}}) except exception.NotFound: - # If the instance doesn't exist anymore, + # If the instance doesn't exist anymore, # then we need to call detach blind volume.finish_detach() else: @@ -601,8 +601,8 @@ class CloudController(object): raise exception.ApiError('attribute not supported: %s' % attribute) if len(kwargs['user_group']) != 1 and kwargs['user_group'][0] != 'all': raise exception.ApiError('only group "all" is supported') - if not operation_type in ['add', 'remove']: - raise exception.ApiError('operation_type must be add or remove') + if not operation_type in ['add', 'delete']: + raise exception.ApiError('operation_type must be add or delete') result = images.modify(context, image_id, operation_type) return defer.succeed(result) -- cgit