From 5f557f47f4815e498a1837852742a4eeb8adb389 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 16 Jul 2020 17:18:17 +0200 Subject: [PATCH] Stop wiping driver_internal_info on node.driver updates It brings more harm than good, e.g. it breaks fast-track. Since driver-specific fields are name-spaced, there should be no much harm in keeping them around. Change-Id: I397d23af64dfd56074cb563eedbe2d1ef8efff53 --- ironic/objects/node.py | 4 ---- ironic/tests/unit/objects/test_node.py | 2 -- 2 files changed, 6 deletions(-) diff --git a/ironic/objects/node.py b/ironic/objects/node.py index d38f1ecd09..0392ee283c 100644 --- a/ironic/objects/node.py +++ b/ironic/objects/node.py @@ -441,10 +441,6 @@ class Node(base.IronicObject, object_base.VersionedObjectDictCompat): updates = self.do_version_changes_for_db() self._validate_property_values(updates.get('properties')) - if 'driver' in updates and 'driver_internal_info' not in updates: - # Clean driver_internal_info when changes driver - self.driver_internal_info = {} - updates = self.do_version_changes_for_db() self._validate_and_remove_traits(updates) self._validate_and_format_conductor_group(updates) db_node = self.dbapi.update_node(self.uuid, updates) diff --git a/ironic/tests/unit/objects/test_node.py b/ironic/tests/unit/objects/test_node.py index a72dc6ea54..707d09e8d7 100644 --- a/ironic/tests/unit/objects/test_node.py +++ b/ironic/tests/unit/objects/test_node.py @@ -171,7 +171,6 @@ class TestNodeObject(db_base.DbTestCase, obj_utils.SchemasTestMixIn): mock_update_node.assert_called_once_with( uuid, {'properties': {"fake": "property"}, 'driver': 'fake-driver', - 'driver_internal_info': {}, 'version': objects.Node.VERSION}) self.assertEqual(self.context, n._context) res_updated_at = (n.updated_at).replace(tzinfo=None) @@ -221,7 +220,6 @@ class TestNodeObject(db_base.DbTestCase, obj_utils.SchemasTestMixIn): { 'properties': {'fake': 'property'}, 'driver': 'fake-driver', - 'driver_internal_info': {}, 'version': objects.Node.VERSION, 'maintenance_reason': maintenance_reason[