summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-15 17:33:39 +0000
committerGerrit Code Review <review@openstack.org>2012-02-15 17:33:39 +0000
commit4c756df0bd48cc5ccbb672be7f2948ec33b6e17f (patch)
tree35c020aa8bdc01be7cc7d6305f5db333717b51c4
parentab548e2e39daafb93ebcb4549a8dfe75c5b5ea94 (diff)
parentcd75e9e18f19168538d6e6d46c6929ae17b2a693 (diff)
downloadnova-4c756df0bd48cc5ccbb672be7f2948ec33b6e17f.tar.gz
nova-4c756df0bd48cc5ccbb672be7f2948ec33b6e17f.tar.xz
nova-4c756df0bd48cc5ccbb672be7f2948ec33b6e17f.zip
Merge "bw_usage takes a MAC address now."
-rw-r--r--nova/db/sqlalchemy/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 1f4f2f88c..4e92c61b6 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3702,7 +3702,7 @@ def bw_usage_get_all_by_filters(context, filters):
filters = filters.copy()
# Filters for exact matches that we can do along with the SQL query.
- exact_match_filter_names = ["instance_id", "network_label",
+ exact_match_filter_names = ["instance_id", "mac",
"start_period", "last_refreshed", "bw_in", "bw_out"]
# Filter the query