1 In-house patch to fix a long standing "TODO" for adding the context |
1 In-house patch to fix a long standing "TODO" for adding the context |
2 argument to the confirm_migration() function. |
2 argument to the confirm_migration() function. This patch has not yet |
|
3 been submitted upstream. |
3 |
4 |
4 --- ./nova/virt/driver.py.~1~ 2015-04-30 05:26:32.000000000 -0600 |
5 --- nova-13.1.0/nova/compute/manager.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
5 +++ ./nova/virt/driver.py 2015-09-28 11:18:42.678804501 -0600 |
6 +++ nova-13.1.0/nova/compute/manager.py 2016-07-06 17:53:50.630410510 -0700 |
6 @@ -526,7 +526,7 @@ class ComputeDriver(object): |
7 @@ -3535,7 +3535,7 @@ class ComputeManager(manager.Manager): |
|
8 |
|
9 network_info = self.network_api.get_instance_nw_info(context, |
|
10 instance) |
|
11 - self.driver.confirm_migration(migration, instance, |
|
12 + self.driver.confirm_migration(context, migration, instance, |
|
13 network_info) |
|
14 |
|
15 migration.status = 'confirmed' |
|
16 --- nova-13.1.0/nova/virt/driver.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
|
17 +++ nova-13.1.0/nova/virt/driver.py 2016-07-06 17:53:50.636123710 -0700 |
|
18 @@ -590,7 +590,7 @@ class ComputeDriver(object): |
7 """ |
19 """ |
8 raise NotImplementedError() |
20 raise NotImplementedError() |
9 |
21 |
10 - def confirm_migration(self, migration, instance, network_info): |
22 - def confirm_migration(self, migration, instance, network_info): |
11 + def confirm_migration(self, context, migration, instance, network_info): |
23 + def confirm_migration(self, context, migration, instance, network_info): |
12 """Confirms a resize, destroying the source VM. |
24 """Confirms a resize/migration, destroying the source VM. |
13 |
25 |
14 :param instance: nova.objects.instance.Instance |
26 :param instance: nova.objects.instance.Instance |
15 --- ./nova/virt/hyperv/driver.py.~1~ 2015-04-30 05:26:19.000000000 -0600 |
27 --- nova-13.1.0/nova/virt/fake.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
16 +++ ./nova/virt/hyperv/driver.py 2015-09-28 11:18:42.679315474 -0600 |
28 +++ nova-13.1.0/nova/virt/fake.py 2016-07-06 17:53:50.637944380 -0700 |
17 @@ -213,7 +213,7 @@ class HyperVDriver(driver.ComputeDriver) |
29 @@ -493,7 +493,7 @@ class FakeDriver(driver.ComputeDriver): |
|
30 block_device_info=None, power_on=True): |
|
31 return |
|
32 |
|
33 - def confirm_migration(self, migration, instance, network_info): |
|
34 + def confirm_migration(self, context, migration, instance, network_info): |
|
35 return |
|
36 |
|
37 def pre_live_migration(self, context, instance, block_device_info, |
|
38 --- nova-13.1.0/nova/virt/hyperv/driver.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
|
39 +++ nova-13.1.0/nova/virt/hyperv/driver.py 2016-07-06 17:53:50.636784880 -0700 |
|
40 @@ -294,7 +294,7 @@ class HyperVDriver(driver.ComputeDriver) |
18 timeout, |
41 timeout, |
19 retry_interval) |
42 retry_interval) |
20 |
43 |
21 - def confirm_migration(self, migration, instance, network_info): |
44 - def confirm_migration(self, migration, instance, network_info): |
22 + def confirm_migration(self, context, migration, instance, network_info): |
45 + def confirm_migration(self, context, migration, instance, network_info): |
23 self._migrationops.confirm_migration(migration, instance, network_info) |
46 self._migrationops.confirm_migration(migration, instance, network_info) |
24 |
47 |
25 def finish_revert_migration(self, context, instance, network_info, |
48 def finish_revert_migration(self, context, instance, network_info, |
26 --- ./nova/virt/hyperv/migrationops.py.~1~ 2015-04-30 05:26:19.000000000 -0600 |
49 --- nova-13.1.0/nova/virt/hyperv/migrationops.py.~1~ 2016-06-14 08:45:36.000000000 -0700 |
27 +++ ./nova/virt/hyperv/migrationops.py 2015-09-28 11:18:42.679774671 -0600 |
50 +++ nova-13.1.0/nova/virt/hyperv/migrationops.py 2016-07-06 17:53:50.637370840 -0700 |
28 @@ -133,7 +133,7 @@ class MigrationOps(object): |
51 @@ -135,7 +135,7 @@ class MigrationOps(object): |
29 # disk_info is not used |
52 # disk_info is not used |
30 return "" |
53 return "" |
31 |
54 |
32 - def confirm_migration(self, migration, instance, network_info): |
55 - def confirm_migration(self, migration, instance, network_info): |
33 + def confirm_migration(self, context, migration, instance, network_info): |
56 + def confirm_migration(self, context, migration, instance, network_info): |
34 LOG.debug("confirm_migration called", instance=instance) |
57 LOG.debug("confirm_migration called", instance=instance) |
35 |
58 |
36 self._pathutils.get_instance_migr_revert_dir(instance.name, |
59 self._pathutils.get_instance_migr_revert_dir(instance.name, |
37 --- ./nova/virt/vmwareapi/driver.py.~1~ 2015-04-30 05:26:32.000000000 -0600 |
60 --- nova-13.1.0/nova/virt/libvirt/driver.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
38 +++ ./nova/virt/vmwareapi/driver.py 2015-09-28 11:18:42.680389230 -0600 |
61 +++ nova-13.1.0/nova/virt/libvirt/driver.py 2016-07-06 17:53:50.635162405 -0700 |
39 @@ -280,7 +280,7 @@ class VMwareVCDriver(driver.ComputeDrive |
62 @@ -7506,7 +7506,7 @@ class LibvirtDriver(driver.ComputeDriver |
|
63 LOG.debug("finish_revert_migration finished successfully.", |
|
64 instance=instance) |
|
65 |
|
66 - def confirm_migration(self, migration, instance, network_info): |
|
67 + def confirm_migration(self, context, migration, instance, network_info): |
|
68 """Confirms a resize, destroying the source VM.""" |
|
69 self._cleanup_resize(instance, network_info) |
|
70 |
|
71 --- nova-13.1.0/nova/virt/vmwareapi/driver.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
|
72 +++ nova-13.1.0/nova/virt/vmwareapi/driver.py 2016-07-06 17:53:50.631418330 -0700 |
|
73 @@ -287,7 +287,7 @@ class VMwareVCDriver(driver.ComputeDrive |
40 return self._vmops.migrate_disk_and_power_off(context, instance, |
74 return self._vmops.migrate_disk_and_power_off(context, instance, |
41 dest, flavor) |
75 dest, flavor) |
42 |
76 |
43 - def confirm_migration(self, migration, instance, network_info): |
77 - def confirm_migration(self, migration, instance, network_info): |
44 + def confirm_migration(self, context, migration, instance, network_info): |
78 + def confirm_migration(self, context, migration, instance, network_info): |
45 """Confirms a resize, destroying the source VM.""" |
79 """Confirms a resize, destroying the source VM.""" |
46 self._vmops.confirm_migration(migration, instance, network_info) |
80 self._vmops.confirm_migration(migration, instance, network_info) |
47 |
81 |
48 --- ./nova/virt/vmwareapi/vmops.py.~1~ 2015-04-30 05:26:32.000000000 -0600 |
82 --- nova-13.1.0/nova/virt/vmwareapi/vmops.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
49 +++ ./nova/virt/vmwareapi/vmops.py 2015-09-28 11:18:42.681486983 -0600 |
83 +++ nova-13.1.0/nova/virt/vmwareapi/vmops.py 2016-07-06 17:53:50.632521145 -0700 |
50 @@ -1198,7 +1198,7 @@ class VMwareVMOps(object): |
84 @@ -1369,7 +1369,7 @@ class VMwareVMOps(object): |
51 step=4, |
85 step=4, |
52 total_steps=RESIZE_TOTAL_STEPS) |
86 total_steps=RESIZE_TOTAL_STEPS) |
53 |
87 |
54 - def confirm_migration(self, migration, instance, network_info): |
88 - def confirm_migration(self, migration, instance, network_info): |
55 + def confirm_migration(self, context, migration, instance, network_info): |
89 + def confirm_migration(self, context, migration, instance, network_info): |
56 """Confirms a resize, destroying the source VM.""" |
90 """Confirms a resize, destroying the source VM.""" |
57 vm_ref = vm_util.get_vm_ref(self._session, instance) |
91 vm_ref = vm_util.get_vm_ref(self._session, instance) |
58 vmdk = vm_util.get_vmdk_info(self._session, vm_ref, |
92 vmdk = vm_util.get_vmdk_info(self._session, vm_ref, |
59 --- ./nova/virt/xenapi/driver.py.~1~ 2015-04-30 05:26:19.000000000 -0600 |
93 --- nova-13.1.0/nova/virt/xenapi/driver.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
60 +++ ./nova/virt/xenapi/driver.py 2015-09-28 11:18:42.682013351 -0600 |
94 +++ nova-13.1.0/nova/virt/xenapi/driver.py 2016-07-06 17:53:50.639919940 -0700 |
61 @@ -191,9 +191,8 @@ class XenAPIDriver(driver.ComputeDriver) |
95 @@ -192,9 +192,8 @@ class XenAPIDriver(driver.ComputeDriver) |
62 self._vmops.spawn(context, instance, image_meta, injected_files, |
96 self._vmops.spawn(context, instance, image_meta, injected_files, |
63 admin_password, network_info, block_device_info) |
97 admin_password, network_info, block_device_info) |
64 |
98 |
65 - def confirm_migration(self, migration, instance, network_info): |
99 - def confirm_migration(self, migration, instance, network_info): |
66 + def confirm_migration(self, context, migration, instance, network_info): |
100 + def confirm_migration(self, context, migration, instance, network_info): |
67 """Confirms a resize, destroying the source VM.""" |
101 """Confirms a resize, destroying the source VM.""" |
68 - # TODO(Vek): Need to pass context in for access to auth_token |
102 - # TODO(Vek): Need to pass context in for access to auth_token |
69 self._vmops.confirm_migration(migration, instance, network_info) |
103 self._vmops.confirm_migration(migration, instance, network_info) |
70 |
104 |
71 def finish_revert_migration(self, context, instance, network_info, |
105 def finish_revert_migration(self, context, instance, network_info, |
72 --- ./nova/virt/xenapi/vmops.py.~1~ 2015-04-30 05:26:19.000000000 -0600 |
106 --- nova-13.1.0/nova/virt/xenapi/vmops.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
73 +++ ./nova/virt/xenapi/vmops.py 2015-09-28 11:18:42.682852646 -0600 |
107 +++ nova-13.1.0/nova/virt/xenapi/vmops.py 2016-07-06 17:53:50.639195245 -0700 |
74 @@ -203,7 +203,7 @@ class VMOps(object): |
108 @@ -205,7 +205,7 @@ class VMOps(object): |
75 nova_uuids.append(nova_uuid) |
109 nova_uuids.append(nova_uuid) |
76 return nova_uuids |
110 return nova_uuids |
77 |
111 |
78 - def confirm_migration(self, migration, instance, network_info): |
112 - def confirm_migration(self, migration, instance, network_info): |
79 + def confirm_migration(self, context, migration, instance, network_info): |
113 + def confirm_migration(self, context, migration, instance, network_info): |
80 self._destroy_orig_vm(instance, network_info) |
114 self._destroy_orig_vm(instance, network_info) |
81 |
115 |
82 def _destroy_orig_vm(self, instance, network_info): |
116 def _destroy_orig_vm(self, instance, network_info): |
83 --- ./nova/virt/fake.py.~1~ 2015-04-30 05:26:32.000000000 -0600 |
|
84 +++ ./nova/virt/fake.py 2015-09-28 11:18:42.683360500 -0600 |
|
85 @@ -488,7 +488,7 @@ class FakeDriver(driver.ComputeDriver): |
|
86 block_device_info=None, power_on=True): |
|
87 return |
|
88 |
|
89 - def confirm_migration(self, migration, instance, network_info): |
|
90 + def confirm_migration(self, context, migration, instance, network_info): |
|
91 return |
|
92 |
|
93 def pre_live_migration(self, context, instance, block_device_info, |
|
94 --- ./nova/virt/libvirt/driver.py.~1~ 2015-04-30 05:26:32.000000000 -0600 |
|
95 +++ ./nova/virt/libvirt/driver.py 2015-09-28 11:18:42.685306371 -0600 |
|
96 @@ -6517,7 +6517,7 @@ class LibvirtDriver(driver.ComputeDriver |
|
97 instance) |
|
98 timer.start(interval=0.5).wait() |
|
99 |
|
100 - def confirm_migration(self, migration, instance, network_info): |
|
101 + def confirm_migration(self, context, migration, instance, network_info): |
|
102 """Confirms a resize, destroying the source VM.""" |
|
103 self._cleanup_resize(instance, network_info) |
|
104 |
|
105 --- ./nova/compute/manager.py.~1~ 2015-04-30 05:26:32.000000000 -0600 |
|
106 +++ ./nova/compute/manager.py 2015-09-28 11:18:42.687005117 -0600 |
|
107 @@ -3700,7 +3700,7 @@ class ComputeManager(manager.Manager): |
|
108 migration.source_compute, teardown=True) |
|
109 |
|
110 network_info = self._get_instance_nw_info(context, instance) |
|
111 - self.driver.confirm_migration(migration, instance, |
|
112 + self.driver.confirm_migration(context, migration, instance, |
|
113 network_info) |
|
114 |
|
115 migration.status = 'confirmed' |
|