summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-02-18 14:15:04 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-02-18 14:15:04 +0900
commitd88d74c9a0a28e0ebd6cedf694753b9ee9decdac (patch)
tree8f44c51cea4ff9ca171a4d7b133223956a166c26 /bin
parentea5e1b141c787053bab273e127f986800cb1712b (diff)
fixed based on reviewer's comment.
1. erase wrapper function(remove/exists/mktempfile) from nova.utils. 2. nova-manage service describeresource(->describe_resource) 3. nova-manage service updateresource(->update_resource) 4. erase "my mistake print" statement Additional changes are made at: 1. nova.image.s3.show 2. nova.compute.api.create that's because instances cannot launched without this changes.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 7336a582b..0bfe0d969 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -574,7 +574,7 @@ class ServiceCommands(object):
return
db.service_update(ctxt, svc['id'], {'disabled': True})
- def describeresource(self, host):
+ def describe_resource(self, host):
"""describe cpu/memory/hdd info for host."""
result = rpc.call(context.get_admin_context(),
@@ -606,7 +606,7 @@ class ServiceCommands(object):
val['memory_mb'],
val['local_gb'])
- def updateresource(self, host):
+ def update_resource(self, host):
"""update available vcpu/memory/disk info for host."""
ctxt = context.get_admin_context()
@@ -618,9 +618,9 @@ class ServiceCommands(object):
if len(service_refs) <= 0:
raise exception.Invalid(_('%s is not compute node.') % host)
- result = rpc.call(ctxt,
- db.queue_get_for(ctxt, FLAGS.compute_topic, host),
- {"method": "update_available_resource"})
+ rpc.call(ctxt,
+ db.queue_get_for(ctxt, FLAGS.compute_topic, host),
+ {"method": "update_available_resource"})
class LogCommands(object):