From 4d3ad0631c18f1f98c9284bf4411321d9a3b093a Mon Sep 17 00:00:00 2001 From: Yunhong Jiang Date: Thu, 17 Apr 2014 09:54:56 -0700 Subject: [PATCH] Use Field in fixed_ip In fixed_ip object, we use IPV4AndV6Address, which is a FieldType instead of Field. Create a Field for IPV4AndV6Address and use it in the fixed_ip object. Change-Id: I0f369a70f755bc7e290edb96656c7c0cb2f3a00a --- nova/objects/fields.py | 4 ++++ nova/objects/fixed_ip.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nova/objects/fields.py b/nova/objects/fields.py index ccf813887a..842dbb497d 100644 --- a/nova/objects/fields.py +++ b/nova/objects/fields.py @@ -481,6 +481,10 @@ class IPV6AddressField(AutoTypedField): AUTO_TYPE = IPV6Address() +class IPV4AndV6AddressField(AutoTypedField): + AUTO_TYPE = IPV4AndV6Address() + + class IPNetworkField(AutoTypedField): AUTO_TYPE = IPNetwork() diff --git a/nova/objects/fixed_ip.py b/nova/objects/fixed_ip.py index 8357f78f72..d39f57701d 100644 --- a/nova/objects/fixed_ip.py +++ b/nova/objects/fixed_ip.py @@ -32,7 +32,7 @@ class FixedIP(obj_base.NovaPersistentObject, obj_base.NovaObject): fields = { 'id': fields.IntegerField(), - 'address': fields.IPV4AndV6Address(), + 'address': fields.IPV4AndV6AddressField(), 'network_id': fields.IntegerField(nullable=True), 'virtual_interface_id': fields.IntegerField(nullable=True), 'instance_uuid': fields.UUIDField(nullable=True),