Interdiff:
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index f107535..b61be65 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -2663,7 +2663,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
def CheckParameterSyntax(cls, hvparams):
"""Check the given parameters for validity.
- @type hvparams: dict of strings
+ @type hvparams: dict of strings
@param hvparams: hypervisor parameters
@raise errors.HypervisorError: when a parameter is not valid
@@ -2736,7 +2736,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
def ValidateParameters(cls, hvparams):
"""Check the given parameters for validity.
- @type hvparams: dict
+ @type hvparams: dict of strings
@param hvparams: hypervisor parameters
@raise errors.HypervisorError: when a parameter is not valid
Thanks,
Jose
On Jun 06 15:28, Hrvoje Ribicic wrote:
> On Fri, Jun 6, 2014 at 10:51 AM, 'Jose A. Lopes' via ganeti-devel <
> [email protected]> wrote:
>
> > ... in the KVM hypervisor module.
> >
> > Signed-off-by: Jose A. Lopes <[email protected]>
> > ---
> > lib/hypervisor/hv_kvm.py | 15 +++++++++------
> > 1 file changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
> > index ed5488e..f107535 100644
> > --- a/lib/hypervisor/hv_kvm.py
> > +++ b/lib/hypervisor/hv_kvm.py
> > @@ -1217,7 +1217,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
> > @type instance_name: string
> > @param instance_name: the instance name
> > @type hvparams: dict of strings
> > - @param hvparams: hvparams to be used with this instance
> > + @param hvparams: hypervisor parameters to be used with this instance
> > @rtype: tuple of strings
> > @return: (name, id, memory, vcpus, stat, times)
> >
> > @@ -1250,7 +1250,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
> > """Get properties of all instances.
> >
> > @type hvparams: dict of strings
> > - @param hvparams: hypervisor parameter
> > + @param hvparams: hypervisor parameters
> > @return: list of tuples (name, id, memory, vcpus, stat, times)
> >
> > """
> > @@ -2040,6 +2040,9 @@ class KVMHypervisor(hv_base.BaseHypervisor):
> > def _StartKvmd(hvparams):
> > """Ensure that the Kvm daemon is running.
> >
> > + @type hvparams: dict of strings
> > + @param hvparams: hypervisor parameters
> > +
> > """
> > if hvparams is None \
> > or not hvparams[constants.HV_KVM_USER_SHUTDOWN] \
> > @@ -2660,8 +2663,8 @@ class KVMHypervisor(hv_base.BaseHypervisor):
> > def CheckParameterSyntax(cls, hvparams):
> > """Check the given parameters for validity.
> >
> > - @type hvparams: dict
> > - @param hvparams: dictionary with parameter names/value
> > + @type hvparams: dict of strings
> > + @param hvparams: hypervisor parameters
> > @raise errors.HypervisorError: when a parameter is not valid
> >
> > """
> > @@ -2734,7 +2737,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
> > """Check the given parameters for validity.
> >
> > @type hvparams: dict
> >
>
> If already fixing: dict of strings?
>
> - @param hvparams: dictionary with parameter names/value
> > + @param hvparams: hypervisor parameters
> > @raise errors.HypervisorError: when a parameter is not valid
> >
> > """
> > @@ -2795,7 +2798,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
> > """KVM powercycle, just a wrapper over Linux powercycle.
> >
> > @type hvparams: dict of strings
> > - @param hvparams: hypervisor params to be used on this node
> > + @param hvparams: hypervisor parameters to be used on this node
> >
> > """
> > cls.LinuxPowercycle()
> > --
> > 2.0.0.526.g5318336
> >
> >
> LGTM, no need to resend for the tiny fix
--
Jose Antonio Lopes
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Steuernummer: 48/725/00206
Umsatzsteueridentifikationsnummer: DE813741370
