diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-17 13:47:28 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-17 13:47:28 -0500 |
| commit | 749eac4d36ff2f7a855044d677f3cde07451f32a (patch) | |
| tree | ecf74cb3b1580dfd00b3f9163a6b489188c323fb /nova/compute | |
| parent | c3300c29277423c28c5403d23b4a7f0a960f429d (diff) | |
bunch of docstring changes
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 8 | ||||
| -rw-r--r-- | nova/compute/manager.py | 5 |
2 files changed, 7 insertions, 6 deletions
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) |
