From 09bd503a9842857480bd4703d27335e83dd30571 Mon Sep 17 00:00:00 2001
From: Kei Masumoto <masumotok@nttdata.co.jp>
Date: Sat, 11 Jun 2011 19:48:48 +0900
Subject: block migration feature added

---
 bin/nova-manage | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index b0cd343f5..220f6e77a 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -649,11 +649,12 @@ class VmCommands(object):
                 instance['availability_zone'],
                 instance['launch_index'])
 
-    def live_migration(self, ec2_id, dest):
+    def _migration(self, ec2_id, dest, block_migration=False):
         """Migrates a running instance to a new machine.
 
         :param ec2_id: instance id which comes from euca-describe-instance.
         :param dest: destination host name.
+        :param block_migration: if True, do block_migration.
 
         """
 
@@ -676,11 +677,30 @@ class VmCommands(object):
                  {"method": "live_migration",
                   "args": {"instance_id": instance_id,
                            "dest": dest,
-                           "topic": FLAGS.compute_topic}})
+                           "topic": FLAGS.compute_topic,
+                           "block_migration": block_migration}})
 
         print _('Migration of %s initiated.'
                'Check its progress using euca-describe-instances.') % ec2_id
 
+    def live_migration(self, ec2_id, dest):
+        """Migrates a running instance to a new machine.
+
+        :param ec2_id: instance id which comes from euca-describe-instance.
+        :param dest: destination host name.
+
+        """
+        self._migration(ec2_id, dest)
+
+    def block_migration(self, ec2_id, dest):
+        """Migrates a running instance to a new machine with storage data.
+
+        :param ec2_id: instance id which comes from euca-describe-instance.
+        :param dest: destination host name.
+
+        """
+        self._migration(ec2_id, dest, True)
+
 
 class ServiceCommands(object):
     """Enable and disable running services"""
@@ -749,9 +769,19 @@ class ServiceCommands(object):
             mem_u = result['resource']['memory_mb_used']
             hdd_u = result['resource']['local_gb_used']
 
+            cpu_sum = 0
+            mem_sum = 0
+            hdd_sum = 0
             print 'HOST\t\t\tPROJECT\t\tcpu\tmem(mb)\tdisk(gb)'
             print '%s(total)\t\t\t%s\t%s\t%s' % (host, cpu, mem, hdd)
-            print '%s(used)\t\t\t%s\t%s\t%s' % (host, cpu_u, mem_u, hdd_u)
+            print '%s(used_now)\t\t\t%s\t%s\t%s' % (host, cpu_u, mem_u, hdd_u)
+            for p_id, val in result['usage'].items():
+                cpu_sum += val['vcpus']
+                mem_sum += val['memory_mb']
+                hdd_sum += val['local_gb']
+            print '%s(used_max)\t\t\t%s\t%s\t%s' % (host, cpu_sum,
+                                                    mem_sum, hdd_sum)
+
             for p_id, val in result['usage'].items():
                 print '%s\t\t%s\t\t%s\t%s\t%s' % (host,
                                                   p_id,
-- 
cgit