diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-01 16:15:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-01 16:15:47 +0000 |
| commit | 79ae282de89ec534807cb153960db4bccc75e06c (patch) | |
| tree | 4cfa64fe49a5a91290f2ef9c29c5529ecf0042f3 | |
| parent | e9f1f3a0ef4968a74f2ec0fcd9c6e40ff1f8a48f (diff) | |
| parent | 5d0918a270564b14e0974d6f45378ffc79e8a654 (diff) | |
| download | nova-79ae282de89ec534807cb153960db4bccc75e06c.tar.gz nova-79ae282de89ec534807cb153960db4bccc75e06c.tar.xz nova-79ae282de89ec534807cb153960db4bccc75e06c.zip | |
Merge "Fix 'begining' typo in system usage data bug 884307"
| -rw-r--r-- | nova/compute/utils.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_compute_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/utils.py b/nova/compute/utils.py index ab4a7802f..885ba9360 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -47,7 +47,7 @@ def notify_usage_exists(instance_ref, current_period=False): audit_start): bw[b.network_label] = dict(bw_in=b.bw_in, bw_out=b.bw_out) usage_info = utils.usage_from_instance(instance_ref, - audit_period_begining=str(audit_start), + audit_period_beginning=str(audit_start), audit_period_ending=str(audit_end), bandwidth=bw) notifier_api.notify('compute.%s' % FLAGS.host, diff --git a/nova/tests/test_compute_utils.py b/nova/tests/test_compute_utils.py index a70e7f5b0..5efb10166 100644 --- a/nova/tests/test_compute_utils.py +++ b/nova/tests/test_compute_utils.py @@ -91,7 +91,7 @@ class UsageInfoTestCase(test.TestCase): self.assertEquals(str(payload['instance_type_id']), str(type_id)) for attr in ('display_name', 'created_at', 'launched_at', 'state', 'state_description', 'fixed_ips', - 'bandwidth', 'audit_period_begining', + 'bandwidth', 'audit_period_beginning', 'audit_period_ending'): self.assertTrue(attr in payload, msg="Key %s not in payload" % attr) |