diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-27 03:51:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-27 03:51:03 +0000 |
| commit | 1052f9d004d215d62036d7c77b44dd2abe148ea0 (patch) | |
| tree | 0cb95a34d6c1ad879203add990e57472c2565e8d /nova | |
| parent | 9b6699feff3df6ef5d2639e023f37e6cae4c2c63 (diff) | |
| parent | 04d6471f48f72657950198c8e566a2978f0583b2 (diff) | |
| download | nova-1052f9d004d215d62036d7c77b44dd2abe148ea0.tar.gz | |
Merge "Fix for extra_specs KeyError" into stable/juno
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/conductor/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/conductor/test_conductor.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index 6f3c9f004f..9489f01a95 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -532,7 +532,7 @@ class ComputeTaskManager(base.Base): # TODO(timello): originally, instance_type in request_spec # on compute.api.resize does not have 'extra_specs', so we # remove it for now to keep tests backward compatibility. - request_spec['instance_type'].pop('extra_specs') + request_spec['instance_type'].pop('extra_specs', None) (host, node) = (host_state['host'], host_state['nodename']) self.compute_rpcapi.prep_resize( diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 44c412bff0..a4015e3098 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -1936,7 +1936,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase): inst_obj = objects.Instance._from_db_object( self.context, objects.Instance(), inst, expected_attrs=[]) - request_spec = dict(instance_type=dict(extra_specs=dict()), + request_spec = dict(instance_type=dict(), instance_properties=dict()) filter_props = dict(context=None) resvs = 'fake-resvs' |