diff options
author | Svetlana Shturm <sshturm@mirantis.com> | 2013-06-25 13:47:11 +0100 |
---|---|---|
committer | Svetlana Shturm <sshturm@mirantis.com> | 2013-06-25 13:47:21 +0100 |
commit | b9483bcb5fb6b44ae65e016bd02dd985cd768d77 (patch) | |
tree | 973c568ba15e40bb03e2381e64affea9f206dd85 /nova | |
parent | 0707f9b471f0a4f6964cf132502abfae89800360 (diff) | |
download | nova-b9483bcb5fb6b44ae65e016bd02dd985cd768d77.tar.gz nova-b9483bcb5fb6b44ae65e016bd02dd985cd768d77.tar.xz nova-b9483bcb5fb6b44ae65e016bd02dd985cd768d77.zip |
Sync db.models and migrations.
This patch syncs models with migrations for:
- DNSDomain
- AggregateMetadata
- BandwidthUsage
Blueprint: db-sync-models-with-migrations
Change-Id: I09c48bac5ed780a7ec1b89cc8ce0684f4903d9dd
Diffstat (limited to 'nova')
-rw-r--r-- | nova/db/sqlalchemy/models.py | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 9b6d849d3..90d228080 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -753,11 +753,15 @@ class FloatingIp(BASE, NovaBase): class DNSDomain(BASE, NovaBase): """Represents a DNS domain with availability zone or project info.""" __tablename__ = 'dns_domains' + __table_args__ = ( + Index('project_id', 'project_id'), + Index('dns_domains_domain_deleted_idx', 'domain', 'deleted'), + ) deleted = Column(Boolean, default=False) - domain = Column(String(512), primary_key=True) - scope = Column(String(255)) - availability_zone = Column(String(255)) - project_id = Column(String(255)) + domain = Column(String(255), primary_key=True) + scope = Column(String(255), nullable=True) + availability_zone = Column(String(255), nullable=True) + project_id = Column(String(255), nullable=True) class ConsolePool(BASE, NovaBase): @@ -892,6 +896,9 @@ class AggregateHost(BASE, NovaBase): class AggregateMetadata(BASE, NovaBase): """Represents a metadata key/value pair for an aggregate.""" __tablename__ = 'aggregate_metadata' + __table_args__ = ( + Index('aggregate_metadata_key_idx', 'key'), + ) id = Column(Integer, primary_key=True) key = Column(String(255), nullable=False) value = Column(String(255), nullable=False) @@ -948,15 +955,19 @@ class AgentBuild(BASE, NovaBase): class BandwidthUsage(BASE, NovaBase): """Cache for instance bandwidth usage data pulled from the hypervisor.""" __tablename__ = 'bw_usage_cache' + __table_args__ = ( + Index('bw_usage_cache_uuid_start_period_idx', 'uuid', + 'start_period'), + ) id = Column(Integer, primary_key=True, nullable=False) - uuid = Column(String(36), nullable=False) - mac = Column(String(255), nullable=False) + uuid = Column(String(36), nullable=True) + mac = Column(String(255), nullable=True) start_period = Column(DateTime, nullable=False) - last_refreshed = Column(DateTime) - bw_in = Column(BigInteger) - bw_out = Column(BigInteger) - last_ctr_in = Column(BigInteger) - last_ctr_out = Column(BigInteger) + last_refreshed = Column(DateTime, nullable=True) + bw_in = Column(BigInteger, nullable=True) + bw_out = Column(BigInteger, nullable=True) + last_ctr_in = Column(BigInteger, nullable=True) + last_ctr_out = Column(BigInteger, nullable=True) class VolumeUsage(BASE, NovaBase): |