opcodes: Annotate the OP_RESULT of query operations

[ganeti-local] / lib / hypervisor / hv_lxc.py

diff --git a/lib/hypervisor/hv_lxc.py b/lib/hypervisor/hv_lxc.py
index 9d56bd2..70e7384 100644 (file)
--- a/lib/hypervisor/hv_lxc.py
+++ b/lib/hypervisor/hv_lxc.py
@@ -29,7 +29,7 @@ import time
 import logging
 
 from ganeti import constants
 import logging
 
 from ganeti import constants

-from ganeti import errors # pylint: disable-msg=W0611
+from ganeti import errors # pylint: disable=W0611

 from ganeti import utils
 from ganeti import objects
 from ganeti.hypervisor import hv_base
 from ganeti import utils
 from ganeti import objects
 from ganeti.hypervisor import hv_base

@@ -361,6 +361,18 @@ class LXCHypervisor(hv_base.BaseHypervisor):
     raise HypervisorError("The LXC hypervisor doesn't implement the"
                           " reboot functionality")
 
     raise HypervisorError("The LXC hypervisor doesn't implement the"
                           " reboot functionality")
 

+  def BalloonInstanceMemory(self, instance, mem):
+    """Balloon an instance memory to a certain value.
+
+    @type instance: L{objects.Instance}
+    @param instance: instance to be accepted
+    @type mem: int
+    @param mem: actual memory size to use for instance runtime
+
+    """
+    # Currently lxc instances don't have memory limits
+    pass
+

   def GetNodeInfo(self):
     """Return information about the node.
 
   def GetNodeInfo(self):
     """Return information about the node.
 

@@ -413,3 +425,16 @@ class LXCHypervisor(hv_base.BaseHypervisor):
 
     """
     raise HypervisorError("Migration is not supported by the LXC hypervisor")
 
     """
     raise HypervisorError("Migration is not supported by the LXC hypervisor")

+
+  def GetMigrationStatus(self, instance):
+    """Get the migration status
+
+    @type instance: L{objects.Instance}
+    @param instance: the instance that is being migrated
+    @rtype: L{objects.MigrationStatus}
+    @return: the status of the current migration (one of
+             L{constants.HV_MIGRATION_VALID_STATUSES}), plus any additional
+             progress info that can be retrieved from the hypervisor
+
+    """
+    raise HypervisorError("Migration is not supported by the LXC hypervisor")