[lxc-devel] [nova-lxd/master] Sync Compute Driver

[zulcss on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 334 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160519/dcf874c5/attachment.bin>
-------------- next part --------------
From c019cf0a145506d4a538e5c98be888f0f590f2fd Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short at canonical.com>
Date: Thu, 19 May 2016 14:58:15 -0400
Subject: [PATCH 1/2] More compute driver syncs

More syncs with compute driver

Signed-off-by: Chuck Short <chuck.short at canonical.com>
---
 nova/virt/lxd/driver.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nova/virt/lxd/driver.py b/nova/virt/lxd/driver.py
index 5778f06..fdee8df 100644
--- a/nova/virt/lxd/driver.py
+++ b/nova/virt/lxd/driver.py
@@ -157,6 +157,10 @@ def detach_volume(self, connection_info, instance, mountpoint,
                       encryption=None):
         raise NotImplementedError()
 
+    def swap_volume(self, old_connection_info, new_connection_info,
+                     instance, mountpoint, resize_to):
+        raise NotImplementedError()
+
     def attach_interface(self, instance, image_meta, vif):
         return self.container_ops.container_attach_interface(instance,
                                                              image_meta,
@@ -245,10 +249,27 @@ def live_migration(self, context, instance, dest,
                        migrate_data=None):
         raise NotImplementedError()
 
+    def live_migration_force_complete(self, instance):
+        raise NotImplementedError()
+
+    def live_migration_abort(self, instance):
+        raise NotImplementedError()
+
+    def rollback_live_migration_at_destination(self, context, instance,
+                                               network_info,
+                                               block_device_info
+                                               destroy_disks=True,
+                                               migrate_data=None):
+        raise NotImplementedError()
+                                                
+
     def post_live_migration(self, context, instance, block_device_info,
                             migrate_data=None):
         raise NotImplementedError()
 
+    def post_live_migration_at_source(self, context, instance, network_info):
+        raise NotImplementedError()
+
     def post_live_migration_at_destination(self, context, instance,
                                            network_info,
                                            block_migration=False,

From 4f872040f94520fa8cd9ff3f1c5daadbcec4650b Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short at canonical.com>
Date: Thu, 19 May 2016 15:05:20 -0400
Subject: [PATCH 2/2] Fix pep8

Signed-off-by: Chuck Short <chuck.short at canonical.com>
---
 nova/virt/lxd/driver.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nova/virt/lxd/driver.py b/nova/virt/lxd/driver.py
index fdee8df..350a9cc 100644
--- a/nova/virt/lxd/driver.py
+++ b/nova/virt/lxd/driver.py
@@ -158,7 +158,7 @@ def detach_volume(self, connection_info, instance, mountpoint,
         raise NotImplementedError()
 
     def swap_volume(self, old_connection_info, new_connection_info,
-                     instance, mountpoint, resize_to):
+                    instance, mountpoint, resize_to):
         raise NotImplementedError()
 
     def attach_interface(self, instance, image_meta, vif):
@@ -257,11 +257,10 @@ def live_migration_abort(self, instance):
 
     def rollback_live_migration_at_destination(self, context, instance,
                                                network_info,
-                                               block_device_info
+                                               block_device_info,
                                                destroy_disks=True,
                                                migrate_data=None):
         raise NotImplementedError()
-                                                
 
     def post_live_migration(self, context, instance, block_device_info,
                             migrate_data=None):