diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-09 16:08:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-09 16:08:24 +0000 |
| commit | 704de0a0a441caa9872a42b968eeb8cff84809a4 (patch) | |
| tree | dd4fa7cf6eb7898586a6085cb366c6917a2b8184 /nova | |
| parent | 011ad63fd983628ead8c1b6bd63ea8fcead4a575 (diff) | |
| parent | 3fe9771ad27233dd82625adc6d4cd7a396c0974f (diff) | |
| download | nova-704de0a0a441caa9872a42b968eeb8cff84809a4.tar.gz | |
Merge "Join flavor when re-querying instance for floating ip association"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/api.py | 4 | ||||
| -rw-r--r-- | nova/tests/unit/network/test_api.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/network/api.py b/nova/network/api.py index 1174e20490..6ab0c2b48a 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -224,8 +224,8 @@ class API(base_api.NetworkAPI): instance_id=orig_instance_uuid) LOG.info(_LI('re-assign floating IP %(address)s from ' 'instance %(instance_id)s'), msg_dict) - orig_instance = objects.Instance.get_by_uuid(context, - orig_instance_uuid) + orig_instance = objects.Instance.get_by_uuid( + context, orig_instance_uuid, expected_attrs=['flavor']) # purge cached nw info for the original instance base_api.update_instance_cache_with_nw_info(self, context, diff --git a/nova/tests/unit/network/test_api.py b/nova/tests/unit/network/test_api.py index 6b2487fb61..c6a30be7dc 100644 --- a/nova/tests/unit/network/test_api.py +++ b/nova/tests/unit/network/test_api.py @@ -196,6 +196,8 @@ class ApiTestCase(test.TestCase): def fake_instance_get_by_uuid(context, instance_uuid, columns_to_join=None, use_slave=None): + if instance_uuid == orig_instance_uuid: + self.assertIn('extra.flavor', columns_to_join) return fake_instance.fake_db_instance(uuid=instance_uuid) self.stubs.Set(self.network_api.db, 'instance_get_by_uuid', |