Merge "Add `network_data` field to ironic node object"

2 files changed, 8 insertions, 0 deletions

diff --git a/ironic/tests/unit/db/sqlalchemy/test_migrations.py b/ironic/tests/unit/db/sqlalchemy/test_migrations.py
index fdffe4b99..39293c6ac 100644
--- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py
+++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py
@@ -969,6 +969,13 @@ class MigrationCheckersMixin(object):
         col_names = [column.name for column in allocations.c]
         self.assertIn('owner', col_names)
 
+    def _check_cf1a80fdb352(self, engine, data):
+        nodes = db_utils.get_table(engine, 'nodes')
+        col_names = [column.name for column in nodes.c]
+        self.assertIn('network_data', col_names)
+        self.assertIsInstance(
+            nodes.c.network_data.type, sqlalchemy.types.String)
+
     def _pre_upgrade_cd2c80feb331(self, engine):
         data = {
             'node_uuid': uuidutils.generate_uuid(),
diff --git a/ironic/tests/unit/db/utils.py b/ironic/tests/unit/db/utils.py
index a7b720f4b..96254889d 100644
--- a/ironic/tests/unit/db/utils.py
+++ b/ironic/tests/unit/db/utils.py
@@ -228,6 +228,7 @@ def get_test_node(**kw):
         'retired': kw.get('retired', False),
         'retired_reason': kw.get('retired_reason', None),
         'lessee': kw.get('lessee', None),
+        'network_data': kw.get('network_data'),
     }
 
     for iface in drivers_base.ALL_INTERFACES: