summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-06-19 11:45:25 -0700
committerJoe Gordon <jogo@cloudscaling.com>2012-06-19 11:45:25 -0700
commit947f92e80e896f5ffe83a5bde5c55d8043ff3b62 (patch)
treee171dabdae653bffdc164737f3bc24b964c8b906
parenteae762ad2ea6bde52231d5fffc58ed2ad932758d (diff)
downloadnova-947f92e80e896f5ffe83a5bde5c55d8043ff3b62.tar.gz
nova-947f92e80e896f5ffe83a5bde5c55d8043ff3b62.tar.xz
nova-947f92e80e896f5ffe83a5bde5c55d8043ff3b62.zip
Spelling fixes
Change-Id: Id8e49b75821a1272a05ddb6c2cb8ee47ec15afdc
-rw-r--r--nova/db/sqlalchemy/models.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index fc458e021..592d40af3 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -161,7 +161,7 @@ class ComputeNode(BASE, NovaBase):
class Certificate(BASE, NovaBase):
- """Represents a an x509 certificate"""
+ """Represents a x509 certificate"""
__tablename__ = 'certificates'
id = Column(Integer, primary_key=True)
@@ -171,7 +171,7 @@ class Certificate(BASE, NovaBase):
class Instance(BASE, NovaBase):
- """Represents a guest vm."""
+ """Represents a guest VM."""
__tablename__ = 'instances'
injected_files = []
@@ -247,7 +247,7 @@ class Instance(BASE, NovaBase):
display_description = Column(String(255))
# To remember on which host an instance booted.
- # An instance may have moved to another host by live migraiton.
+ # An instance may have moved to another host by live migration.
launched_on = Column(Text)
locked = Column(Boolean)
@@ -269,7 +269,7 @@ class Instance(BASE, NovaBase):
auto_disk_config = Column(Boolean())
progress = Column(Integer)
- # EC2 instance_initiated_shutdown_teminate
+ # EC2 instance_initiated_shutdown_terminate
# True: -> 'terminate'
# False: -> 'stop'
shutdown_terminate = Column(Boolean(), default=True, nullable=False)
@@ -320,7 +320,7 @@ class InstanceTypes(BASE, NovaBase):
class Volume(BASE, NovaBase):
- """Represents a block storage device that can be attached to a vm."""
+ """Represents a block storage device that can be attached to a VM."""
__tablename__ = 'volumes'
id = Column(String(36), primary_key=True)
@@ -479,7 +479,7 @@ class Reservation(BASE, NovaBase):
class Snapshot(BASE, NovaBase):
- """Represents a block storage device that can be attached to a vm."""
+ """Represents a block storage device that can be attached to a VM."""
__tablename__ = 'snapshots'
id = Column(String(36), primary_key=True)
@@ -511,7 +511,7 @@ class BlockDeviceMapping(BASE, NovaBase):
instance_uuid = Column(Integer, ForeignKey('instances.uuid'),
nullable=False)
instance = relationship(Instance,
- backref=backref('balock_device_mapping'),
+ backref=backref('block_device_mapping'),
foreign_keys=instance_uuid,
primaryjoin='and_(BlockDeviceMapping.'
'instance_uuid=='
@@ -541,7 +541,7 @@ class BlockDeviceMapping(BASE, NovaBase):
class IscsiTarget(BASE, NovaBase):
- """Represates an iscsi target for a given host"""
+ """Represents an iscsi target for a given host"""
__tablename__ = 'iscsi_targets'
__table_args__ = (schema.UniqueConstraint("target_num", "host"),
{'mysql_engine': 'InnoDB'})