diff options
author | Joe Gordon <jogo@cloudscaling.com> | 2013-01-25 12:10:16 -0500 |
---|---|---|
committer | Joe Gordon <jogo@cloudscaling.com> | 2013-01-25 12:11:54 -0500 |
commit | 8f394ee71619f099de45e8c33455c141c2f33286 (patch) | |
tree | 2a412967fd8fcf1e9d9ec1759d74184e0024a30f /nova/db/sqlalchemy/models.py | |
parent | f9012e39ee5582192db9289d34df3adaddda2ad1 (diff) | |
download | nova-8f394ee71619f099de45e8c33455c141c2f33286.tar.gz nova-8f394ee71619f099de45e8c33455c141c2f33286.tar.xz nova-8f394ee71619f099de45e8c33455c141c2f33286.zip |
Enable N302: Import modules only
Fix all N302 issues, and re-enable.
Change-Id: Ic94d144c915b228b7ff2fd9c5951875e159ffcdd
Diffstat (limited to 'nova/db/sqlalchemy/models.py')
-rw-r--r-- | nova/db/sqlalchemy/models.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 14c651020..8a09836a2 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -27,7 +27,7 @@ from sqlalchemy import ForeignKey, DateTime, Boolean, Text, Float from sqlalchemy.orm import relationship, backref, object_mapper from nova.db.sqlalchemy.session import get_session -from nova.db.sqlalchemy.types import IPAddress +from nova.db.sqlalchemy import types from nova.openstack.common import cfg from nova.openstack.common import timeutils @@ -291,8 +291,8 @@ class Instance(BASE, NovaBase): # User editable field meant to represent what ip should be used # to connect to the instance - access_ip_v4 = Column(IPAddress()) - access_ip_v6 = Column(IPAddress()) + access_ip_v4 = Column(types.IPAddress()) + access_ip_v6 = Column(types.IPAddress()) auto_disk_config = Column(Boolean()) progress = Column(Integer) @@ -595,7 +595,7 @@ class SecurityGroupIngressRule(BASE, NovaBase): protocol = Column(String(5)) # "tcp", "udp", or "icmp" from_port = Column(Integer) to_port = Column(Integer) - cidr = Column(IPAddress()) + cidr = Column(types.IPAddress()) # Note: This is not the parent SecurityGroup. It's SecurityGroup we're # granting access for. @@ -615,7 +615,7 @@ class ProviderFirewallRule(BASE, NovaBase): protocol = Column(String(5)) # "tcp", "udp", or "icmp" from_port = Column(Integer) to_port = Column(Integer) - cidr = Column(IPAddress()) + cidr = Column(types.IPAddress()) class KeyPair(BASE, NovaBase): @@ -665,25 +665,25 @@ class Network(BASE, NovaBase): label = Column(String(255)) injected = Column(Boolean, default=False) - cidr = Column(IPAddress(), unique=True) - cidr_v6 = Column(IPAddress(), unique=True) + cidr = Column(types.IPAddress(), unique=True) + cidr_v6 = Column(types.IPAddress(), unique=True) multi_host = Column(Boolean, default=False) - gateway_v6 = Column(IPAddress()) - netmask_v6 = Column(IPAddress()) - netmask = Column(IPAddress()) + gateway_v6 = Column(types.IPAddress()) + netmask_v6 = Column(types.IPAddress()) + netmask = Column(types.IPAddress()) bridge = Column(String(255)) bridge_interface = Column(String(255)) - gateway = Column(IPAddress()) - broadcast = Column(IPAddress()) - dns1 = Column(IPAddress()) - dns2 = Column(IPAddress()) + gateway = Column(types.IPAddress()) + broadcast = Column(types.IPAddress()) + dns1 = Column(types.IPAddress()) + dns2 = Column(types.IPAddress()) vlan = Column(Integer) - vpn_public_address = Column(IPAddress()) + vpn_public_address = Column(types.IPAddress()) vpn_public_port = Column(Integer) - vpn_private_address = Column(IPAddress()) - dhcp_start = Column(IPAddress()) + vpn_private_address = Column(types.IPAddress()) + dhcp_start = Column(types.IPAddress()) rxtx_base = Column(Integer) @@ -708,7 +708,7 @@ class FixedIp(BASE, NovaBase): """Represents a fixed ip for an instance.""" __tablename__ = 'fixed_ips' id = Column(Integer, primary_key=True) - address = Column(IPAddress()) + address = Column(types.IPAddress()) network_id = Column(Integer, nullable=True) virtual_interface_id = Column(Integer, nullable=True) instance_uuid = Column(String(36), nullable=True) @@ -725,7 +725,7 @@ class FloatingIp(BASE, NovaBase): """Represents a floating ip that dynamically forwards to a fixed ip.""" __tablename__ = 'floating_ips' id = Column(Integer, primary_key=True) - address = Column(IPAddress()) + address = Column(types.IPAddress()) fixed_ip_id = Column(Integer, nullable=True) project_id = Column(String(255)) host = Column(String(255)) # , ForeignKey('hosts.id')) @@ -748,7 +748,7 @@ class ConsolePool(BASE, NovaBase): """Represents pool of consoles on the same physical node.""" __tablename__ = 'console_pools' id = Column(Integer, primary_key=True) - address = Column(IPAddress()) + address = Column(types.IPAddress()) username = Column(String(255)) password = Column(String(255)) console_type = Column(String(255)) |