author | Sean Wilcox <sean.wilcox@oracle.com> |
Tue, 09 Feb 2016 16:26:27 -0800 | |
branch | s11u3-sru |
changeset 5430 | b6b088be89d5 |
child 5405 | 66fd59fecd68 |
permissions | -rw-r--r-- |
5430
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to fix a long standing "TODO" for adding the context |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
2 |
argument to the confirm_migration() function. |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
3 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
4 |
--- ./nova/virt/driver.py.~1~ 2015-07-06 14:54:33.047120275 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
5 |
+++ ./nova/virt/driver.py 2015-07-06 14:54:38.753366130 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
6 |
@@ -532,7 +532,7 @@ class ComputeDriver(object): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
7 |
""" |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
8 |
raise NotImplementedError() |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
9 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
10 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
11 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
12 |
"""Confirms a resize, destroying the source VM. |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
13 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
14 |
:param instance: nova.objects.instance.Instance |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
15 |
--- ./nova/virt/hyperv/driver.py.~1~ 2015-07-06 14:54:08.762060896 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
16 |
+++ ./nova/virt/hyperv/driver.py 2015-07-06 14:54:15.312335765 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
17 |
@@ -205,7 +205,7 @@ class HyperVDriver(driver.ComputeDriver) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
18 |
timeout, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
19 |
retry_interval) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
20 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
21 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
22 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
23 |
self._migrationops.confirm_migration(migration, instance, network_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
24 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
25 |
def finish_revert_migration(self, context, instance, network_info, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
26 |
--- ./nova/virt/hyperv/migrationops.py.~1~ 2015-07-06 14:54:01.054149365 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
27 |
+++ ./nova/virt/hyperv/migrationops.py 2015-07-06 14:54:07.641370995 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
28 |
@@ -134,7 +134,7 @@ class MigrationOps(object): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
29 |
# disk_info is not used |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
30 |
return "" |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
31 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
32 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
33 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
34 |
LOG.debug("confirm_migration called", instance=instance) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
35 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
36 |
self._pathutils.get_instance_migr_revert_dir(instance['name'], |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
37 |
--- ./nova/virt/vmwareapi/driver.py.~1~ 2015-07-06 14:54:25.357745275 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
38 |
+++ ./nova/virt/vmwareapi/driver.py 2015-07-06 14:54:31.960294652 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
39 |
@@ -240,7 +240,7 @@ class VMwareVCDriver(driver.ComputeDrive |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
40 |
return _vmops.migrate_disk_and_power_off(context, instance, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
41 |
dest, flavor) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
42 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
43 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
44 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
45 |
"""Confirms a resize, destroying the source VM.""" |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
46 |
_vmops = self._get_vmops_for_compute_node(instance['node']) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
47 |
_vmops.confirm_migration(migration, instance, network_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
48 |
--- ./nova/virt/vmwareapi/vmops.py.~1~ 2015-07-06 14:54:16.425639034 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
49 |
+++ ./nova/virt/vmwareapi/vmops.py 2015-07-06 14:54:24.242155495 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
50 |
@@ -1038,7 +1038,7 @@ class VMwareVMOps(object): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
51 |
step=3, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
52 |
total_steps=RESIZE_TOTAL_STEPS) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
53 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
54 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
55 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
56 |
"""Confirms a resize, destroying the source VM.""" |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
57 |
# Destroy the original VM. The vm_ref needs to be searched using the |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
58 |
# instance.uuid + self._migrate_suffix as the identifier. We will |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
59 |
--- ./nova/virt/xenapi/driver.py.~1~ 2015-07-06 14:54:39.888243081 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
60 |
+++ ./nova/virt/xenapi/driver.py 2015-07-06 14:54:57.800183720 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
61 |
@@ -203,9 +203,8 @@ class XenAPIDriver(driver.ComputeDriver) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
62 |
self._vmops.spawn(context, instance, image_meta, injected_files, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
63 |
admin_password, network_info, block_device_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
64 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
65 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
66 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
67 |
"""Confirms a resize, destroying the source VM.""" |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
68 |
- # TODO(Vek): Need to pass context in for access to auth_token |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
69 |
self._vmops.confirm_migration(migration, instance, network_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
70 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
71 |
def finish_revert_migration(self, context, instance, network_info, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
72 |
--- ./nova/virt/xenapi/vmops.py.~1~ 2015-07-06 14:54:59.066221974 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
73 |
+++ ./nova/virt/xenapi/vmops.py 2015-07-06 14:55:06.185514152 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
74 |
@@ -203,7 +203,7 @@ class VMOps(object): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
75 |
nova_uuids.append(nova_uuid) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
76 |
return nova_uuids |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
77 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
78 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
79 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
80 |
self._destroy_orig_vm(instance, network_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
81 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
82 |
def _destroy_orig_vm(self, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
83 |
--- ./nova/virt/fake.py.~1~ 2015-07-06 14:53:48.635021003 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
84 |
+++ ./nova/virt/fake.py 2015-07-06 14:53:59.952265943 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
85 |
@@ -434,7 +434,7 @@ class FakeDriver(driver.ComputeDriver): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
86 |
block_device_info=None, power_on=True): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
87 |
return |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
88 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
89 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
90 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
91 |
return |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
92 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
93 |
def pre_live_migration(self, context, instance_ref, block_device_info, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
94 |
--- ./nova/virt/libvirt/driver.py.~1~ 2015-07-06 14:55:07.301721887 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
95 |
+++ ./nova/virt/libvirt/driver.py 2015-07-06 14:55:13.513983532 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
96 |
@@ -6095,7 +6095,7 @@ class LibvirtDriver(driver.ComputeDriver |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
97 |
instance) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
98 |
timer.start(interval=0.5).wait() |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
99 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
100 |
- def confirm_migration(self, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
101 |
+ def confirm_migration(self, context, migration, instance, network_info): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
102 |
"""Confirms a resize, destroying the source VM.""" |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
103 |
self._cleanup_resize(instance, network_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
104 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
105 |
--- ./nova/compute/manager.py.~1~ 2015-07-06 14:56:34.328028956 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
106 |
+++ ./nova/compute/manager.py 2015-07-06 14:56:48.919044192 -0700 |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
107 |
@@ -3431,7 +3431,7 @@ class ComputeManager(manager.Manager): |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
108 |
migration.source_compute, teardown=True) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
109 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
110 |
network_info = self._get_instance_nw_info(context, instance) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
111 |
- self.driver.confirm_migration(migration, instance, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
112 |
+ self.driver.confirm_migration(context, migration, instance, |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
113 |
network_info) |
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
114 |
|
b6b088be89d5
18595100 nova resize does not work
Sean Wilcox <sean.wilcox@oracle.com>
parents:
diff
changeset
|
115 |
migration.status = 'confirmed' |