openstack
/
nova
Code Issues Proposed changes

Merge "Use Field in fixed_ip"

This commit is contained in:
Jenkins 2014-05-07 18:52:52 +00:00 committed by Gerrit Code Review
parent 9b1160ab5a 4d3ad0631c
commit 181b29eba4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/objects/fields.py
View File

@ -481,6 +481,10 @@ class IPV6AddressField(AutoTypedField):
AUTO_TYPE = IPV6Address() AUTO_TYPE = IPV6Address()
class IPV4AndV6AddressField(AutoTypedField):
AUTO_TYPE = IPV4AndV6Address()
class IPNetworkField(AutoTypedField): class IPNetworkField(AutoTypedField):
AUTO_TYPE = IPNetwork() AUTO_TYPE = IPNetwork()

2
nova/objects/fixed_ip.py
View File

@ -32,7 +32,7 @@ class FixedIP(obj_base.NovaPersistentObject, obj_base.NovaObject):
fields = { fields = {
'id': fields.IntegerField(), 'id': fields.IntegerField(),
'address': fields.IPV4AndV6Address(), 'address': fields.IPV4AndV6AddressField(),
'network_id': fields.IntegerField(nullable=True), 'network_id': fields.IntegerField(nullable=True),
'virtual_interface_id': fields.IntegerField(nullable=True), 'virtual_interface_id': fields.IntegerField(nullable=True),
'instance_uuid': fields.UUIDField(nullable=True), 'instance_uuid': fields.UUIDField(nullable=True),