summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2011-06-21 16:55:45 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2011-06-21 16:55:45 +0400
commit0e2b3e932d3e5fe00fed1da95e55808391d4832e (patch)
tree1b022432ed3bb8f79bb11f4f0bd38ebbb000fa2d
parent48556e36e1c20659fcc4934380ec755e94250718 (diff)
downloadnova-0e2b3e932d3e5fe00fed1da95e55808391d4832e.tar.gz
nova-0e2b3e932d3e5fe00fed1da95e55808391d4832e.tar.xz
nova-0e2b3e932d3e5fe00fed1da95e55808391d4832e.zip
Filter out datetime fields from instance_type
-rw-r--r--nova/db/sqlalchemy/api.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7119f43eb..5dc2b9e7a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2510,7 +2510,10 @@ def instance_type_get_by_id(context, id):
if not inst_type:
raise exception.InstanceTypeNotFound(instance_type=id)
else:
- return dict(inst_type)
+ res = dict(inst_type)
+ for field in ['created_at', 'updated_at', 'deleted_at']:
+ res.pop(field, None)
+ return res
@require_context
@@ -2523,7 +2526,10 @@ def instance_type_get_by_name(context, name):
if not inst_type:
raise exception.InstanceTypeNotFoundByName(instance_type_name=name)
else:
- return dict(inst_type)
+ res = dict(inst_type)
+ for field in ['created_at', 'updated_at', 'deleted_at']:
+ res.pop(field, None)
+ return res
@require_context
@@ -2536,7 +2542,10 @@ def instance_type_get_by_flavor_id(context, id):
if not inst_type:
raise exception.FlavorNotFound(flavor_id=id)
else:
- return dict(inst_type)
+ res = dict(inst_type)
+ for field in ['created_at', 'updated_at', 'deleted_at']:
+ res.pop(field, None)
+ return res
@require_admin_context