From 749eac4d36ff2f7a855044d677f3cde07451f32a Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Fri, 17 Jun 2011 13:47:28 -0500 Subject: bunch of docstring changes --- nova/compute/api.py | 8 ++++---- nova/compute/manager.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/api.py b/nova/compute/api.py index b05db3ca5..6c31a9697 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -716,14 +716,14 @@ class API(base.Base): @scheduler_api.reroute_compute("add_fixed_ip") def add_fixed_ip(self, context, instance_id, network_id): - """add fixed_ip from specified network to given instance""" + """Add fixed_ip from specified network to given instance.""" self._cast_compute_message('add_fixed_ip_to_instance', context, instance_id, network_id) #TODO(tr3buchet): how to run this in the correct zone? def add_network_to_project(self, context, project_id): - """force adds a network to the project""" + """Force adds a network to the project.""" # this will raise if zone doesn't know about project so the decorator # can catch it and pass it down self.db.project_get(context, project_id) @@ -873,9 +873,9 @@ class API(base.Base): return instance def associate_floating_ip(self, context, instance_id, address): - """makes calls to network_api to associate_floating_ip + """Makes calls to network_api to associate_floating_ip. - address is a string floating ip address + :param address: is a string floating ip address """ instance = self.get(context, instance_id) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d08286224..2ad0c0d04 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -607,8 +607,9 @@ class ComputeManager(manager.SchedulerDependentManager): @exception.wrap_exception @checks_instance_lock def add_fixed_ip_to_instance(self, context, instance_id, network_id): - """calls network_api to add new fixed_ip to instance - then injects the new network info and resets instance networking + """Calls network_api to add new fixed_ip to instance + then injects the new network info and resets instance networking. + """ self.network_api.add_fixed_ip_to_instance(context, instance_id, network_id) -- cgit