Merge "objects: Don't use generic 'Field' container"

nova/objects/fields.py

@@ -1353,6 +1353,14 @@ class InstancePowerStateField(BaseEnumField):
     AUTO_TYPE = InstancePowerState()
 
 
+class NetworkModelField(AutoTypedField):
+    AUTO_TYPE = NetworkModel()
+
+
+class NetworkVIFModelField(AutoTypedField):
+    AUTO_TYPE = NetworkVIFModel()
+
+
 class ListOfListsOfStringsField(AutoTypedField):
     AUTO_TYPE = List(List(fields.String()))
 

nova/objects/instance_info_cache.py

@@ -36,8 +36,8 @@ class InstanceInfoCache(base.NovaPersistentObject, base.NovaObject):
 
     fields = {
         'instance_uuid': fields.UUIDField(),
-        'network_info': fields.Field(fields.NetworkModel(), nullable=True),
-        }
+        'network_info': fields.NetworkModelField(nullable=True),
+    }
 
     @staticmethod
     def _from_db_object(context, info_cache, db_obj):

nova/objects/migrate_data.py

@@ -55,7 +55,7 @@ class VIFMigrateData(obj_base.NovaObject):
         # destination host is configured for all vif types. See the note in
         # the libvirt driver here: https://review.opendev.org/#/c/551370/
         # 29/nova/virt/libvirt/driver.py@7036
-        'source_vif': fields.Field(fields.NetworkVIFModel()),
+        'source_vif': fields.NetworkVIFModelField(),
     }
 
     @property

nova/tests/unit/objects/test_fields.py

@@ -551,7 +551,7 @@ class TestNetworkModel(TestField):
     def setUp(self):
         super(TestNetworkModel, self).setUp()
         model = network_model.NetworkInfo()
-        self.field = fields.Field(fields.NetworkModel())
+        self.field = fields.NetworkModelField()
         self.coerce_good_values = [(model, model), (model.json(), model)]
         self.coerce_bad_values = [[], 'foo']
         self.to_primitive_values = [(model, model.json())]
@@ -570,7 +570,7 @@ class TestNetworkVIFModel(TestField):
         super(TestNetworkVIFModel, self).setUp()
         model = network_model.VIF('6c197bc7-820c-40d5-8aff-7116b993e793')
         primitive = jsonutils.dumps(model)
-        self.field = fields.Field(fields.NetworkVIFModel())
+        self.field = fields.NetworkVIFModelField()
         self.coerce_good_values = [(model, model), (primitive, model)]
         self.coerce_bad_values = [[], 'foo']
         self.to_primitive_values = [(model, primitive)]