912235cfce
Update the storage drivers to return instances of models classes instead of dictionaries to ensure that they always return the same values. The get_volume_sum(), get_volume_max(), and get_event_interval() methods are not modified because there will be another changeset later replacing the use of those methods with calls to get_meter_statistics(). blueprint storage-api-models Change-Id: I79da8cc69f70a4f4c24aa13e6a5d2982011eee88 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
54 lines
1.7 KiB
Python
54 lines
1.7 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2013 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import unittest
|
|
|
|
from ceilometer.storage import models
|
|
|
|
|
|
class FakeModel(models.Model):
|
|
def __init__(self, arg1, arg2):
|
|
models.Model.__init__(self, arg1=arg1, arg2=arg2)
|
|
|
|
|
|
class ModelTest(unittest.TestCase):
|
|
|
|
def test_create_attributes(self):
|
|
m = FakeModel(1, 2)
|
|
self.assertEqual(m.arg1, 1)
|
|
self.assertEqual(m.arg2, 2)
|
|
|
|
def test_as_dict(self):
|
|
m = FakeModel(1, 2)
|
|
d = m.as_dict()
|
|
self.assertEqual(d, {'arg1': 1, 'arg2': 2})
|
|
|
|
def test_as_dict_recursive(self):
|
|
m = FakeModel(1, FakeModel('a', 'b'))
|
|
d = m.as_dict()
|
|
self.assertEqual(d, {'arg1': 1,
|
|
'arg2': {'arg1': 'a',
|
|
'arg2': 'b'}})
|
|
|
|
def test_as_dict_recursive_list(self):
|
|
m = FakeModel(1, [FakeModel('a', 'b')])
|
|
d = m.as_dict()
|
|
self.assertEqual(d, {'arg1': 1,
|
|
'arg2': [{'arg1': 'a',
|
|
'arg2': 'b'}]})
|