summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorSean Dague <sdague@linux.vnet.ibm.com>2013-01-09 16:00:36 -0500
committerSean Dague <sdague@linux.vnet.ibm.com>2013-01-10 08:57:09 -0500
commit5fca1d9e97913af549adaef0827b189540fc87fa (patch)
tree2a090d66f2288a0972eec2a1c65e4cc2ddeaee1b /nova/db
parent8143021bdb5ec10ea60a6613e29bdc9347701a04 (diff)
fix new N402 errors
fix the N402 errors that have slipped in in the last 48 hrs since starting this patch series. fix an N401 error that our scanner current can't find because it only looks for doc strings on classes and defs. this is the xeno's paradox of patch series, but we're getting close. Change-Id: I4a763bb4c812335d853eae05c72464f18ab93297
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/api.py12
-rw-r--r--nova/db/sqlalchemy/api.py6
-rw-r--r--nova/db/sqlalchemy/models.py4
3 files changed, 11 insertions, 11 deletions
diff --git a/nova/db/api.py b/nova/db/api.py
index 27bb6bf35..b16c7ac20 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1622,32 +1622,32 @@ def instance_fault_get_by_instance_uuids(context, instance_uuids):
def action_start(context, values):
- """Start an action for an instance"""
+ """Start an action for an instance."""
return IMPL.action_start(context, values)
def action_finish(context, values):
- """Finish an action for an instance"""
+ """Finish an action for an instance."""
return IMPL.action_finish(context, values)
def actions_get(context, uuid):
- """Get all instance actions for the provided instance"""
+ """Get all instance actions for the provided instance."""
return IMPL.actions_get(context, uuid)
def action_get_by_id(context, uuid, action_id):
- """Get the action by id and given instance"""
+ """Get the action by id and given instance."""
return IMPL.action_get_by_id(context, uuid, action_id)
def action_event_start(context, values):
- """Start an event on an instance action"""
+ """Start an event on an instance action."""
return IMPL.action_event_start(context, values)
def action_event_finish(context, values):
- """Finish an event on an instance action"""
+ """Finish an event on an instance action."""
return IMPL.action_event_finish(context, values)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index bb6dfc63a..adb8106c4 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -4595,7 +4595,7 @@ def actions_get(context, instance_uuid):
def action_get_by_id(context, instance_uuid, action_id):
- """Get the action by id and given instance"""
+ """Get the action by id and given instance."""
action = model_query(context, models.InstanceAction).\
filter_by(instance_uuid=instance_uuid).\
filter_by(id=action_id).\
@@ -4614,7 +4614,7 @@ def _action_get_by_request_id(context, instance_uuid, request_id,
def action_event_start(context, values):
- """Start an event on an instance action"""
+ """Start an event on an instance action."""
session = get_session()
with session.begin():
action = _action_get_by_request_id(context, values['instance_uuid'],
@@ -4634,7 +4634,7 @@ def action_event_start(context, values):
def action_event_finish(context, values):
- """Finish an event on an instance action"""
+ """Finish an event on an instance action."""
session = get_session()
with session.begin():
action = _action_get_by_request_id(context, values['instance_uuid'],
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 735ef56e2..95fa6313f 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -985,7 +985,7 @@ class InstanceFault(BASE, NovaBase):
class InstanceAction(BASE, NovaBase):
- """Track client actions on an instance"""
+ """Track client actions on an instance."""
__tablename__ = 'instance_actions'
id = Column(Integer, primary_key=True, nullable=False, autoincrement=True)
action = Column(String(255))
@@ -1001,7 +1001,7 @@ class InstanceAction(BASE, NovaBase):
class InstanceActionEvent(BASE, NovaBase):
- """Track events that occur during an InstanceAction"""
+ """Track events that occur during an InstanceAction."""
__tablename__ = 'instance_actions_events'
id = Column(Integer, primary_key=True, nullable=False, autoincrement=True)
event = Column(String(255))