Some epydoc fixes

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

diff --git a/daemons/ganeti-confd b/daemons/ganeti-confd
index 82734ef..c793159 100755 (executable)
--- a/daemons/ganeti-confd
+++ b/daemons/ganeti-confd
@@ -94,7 +94,7 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
                filename=constants.CLUSTER_CONF_FILE):
     """Constructor for ConfdInotifyEventHandler
 
-    @type watch_manager: L{pyinotify.WatchManager}
+    @type watch_manager: pyinotify.WatchManager
     @param watch_manager: ganeti-confd inotify watch manager
     @type callback: function accepting a boolean
     @param callback: function to call when an inotify event happens

diff --git a/epydoc.conf b/epydoc.conf
index b10a844..11069a3 100644 (file)
--- a/epydoc.conf
+++ b/epydoc.conf
@@ -8,7 +8,7 @@ output: html
 # note: the wildcards means the directories should be cleaned up after each
 # run, otherwise there will be stale '*c' (compiled) files that will not be
 # parsable and will break the epydoc run
-modules: ganeti, scripts/gnt-*, daemons/ganeti-*
+modules: ganeti, scripts/gnt-*, daemons/ganeti-confd, daemons/ganeti-masterd, daemons/ganeti-noded, daemons/ganeti-rapi, daemons/ganeti-watcher
 
 graph: all
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 787b9ec..9f604ee 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1095,7 +1095,7 @@ class LUVerifyCluster(LogicalUnit):
     """A class representing the logical and physical status of a node.
 
     @ivar volumes: a structure as returned from
-        L{ganeti.utils.GetVolumeList} (runtime)
+        L{ganeti.backend.GetVolumeList} (runtime)
     @ivar instances: a list of running instances (runtime)
     @ivar pinst: list of configured primary instances (config)
     @ivar sinst: list of configured secondary instances (config)
@@ -4000,7 +4000,7 @@ def _CheckNodesFreeDisk(lu, nodenames, requested):
   @type lu: C{LogicalUnit}
   @param lu: a logical unit from which we get configuration data
   @type nodenames: C{list}
-  @param node: the list of node names to check
+  @param nodenames: the list of node names to check
   @type requested: C{int}
   @param requested: the amount of disk in MiB to check for
   @raise errors.OpPrereqError: if the node doesn't have enough disk, or

diff --git a/lib/hypervisor/hv_base.py b/lib/hypervisor/hv_base.py
index 86b85c9..db8bcb4 100644 (file)
--- a/lib/hypervisor/hv_base.py
+++ b/lib/hypervisor/hv_base.py
@@ -237,7 +237,7 @@ class BaseHypervisor(object):
   def MigrateInstance(self, instance, target, live):
     """Migrate an instance.
 
-    @type instance: L{object.Instance}
+    @type instance: L{objects.Instance}
     @param instance: the instance to be migrated
     @type target: string
     @param target: hostname (usually ip) of the target node

diff --git a/lib/hypervisor/hv_chroot.py b/lib/hypervisor/hv_chroot.py
index f033d5e..cf40c59 100644 (file)
--- a/lib/hypervisor/hv_chroot.py
+++ b/lib/hypervisor/hv_chroot.py
@@ -272,7 +272,7 @@ class ChrootManager(hv_base.BaseHypervisor):
   def MigrateInstance(self, instance, target, live):
     """Migrate an instance.
 
-    @type instance: L{object.Instance}
+    @type instance: L{objects.Instance}
     @param instance: the instance to be migrated
     @type target: string
     @param target: hostname (usually ip) of the target node

diff --git a/lib/hypervisor/hv_fake.py b/lib/hypervisor/hv_fake.py
index 850e568..d607d0d 100644 (file)
--- a/lib/hypervisor/hv_fake.py
+++ b/lib/hypervisor/hv_fake.py
@@ -241,7 +241,7 @@ class FakeHypervisor(hv_base.BaseHypervisor):
   def MigrateInstance(self, instance, target, live):
     """Migrate an instance.
 
-    @type instance: L{object.Instance}
+    @type instance: L{objects.Instance}
     @param instance: the instance to be migrated
     @type target: string
     @param target: hostname (usually ip) of the target node