diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py index 1238ecd211..24b2416fd5 100644 --- a/ceilometer/storage/sqlalchemy/models.py +++ b/ceilometer/storage/sqlalchemy/models.py @@ -42,7 +42,7 @@ def table_args(): engine_name = urlparse(cfg.CONF.database_connection).scheme if engine_name == 'mysql': return {'mysql_engine': cfg.CONF.mysql_engine, - 'mysql_charset': utf8} + 'mysql_charset': "utf8"} return None diff --git a/tests/storage/test_impl_sqlalchemy.py b/tests/storage/test_impl_sqlalchemy.py index e256dde798..5b2bdce4d9 100644 --- a/tests/storage/test_impl_sqlalchemy.py +++ b/tests/storage/test_impl_sqlalchemy.py @@ -28,8 +28,8 @@ from ceilometer import storage from ceilometer.openstack.common import cfg from ceilometer.storage import impl_sqlalchemy -from ceilometer.storage.sqlalchemy.models import Meter, Project, Resource -from ceilometer.storage.sqlalchemy.models import User +from ceilometer.storage.sqlalchemy.models import Meter, Project, Resource, User +from ceilometer.storage.sqlalchemy.models import table_args LOG = logging.getLogger(__name__) @@ -721,3 +721,8 @@ def test_start_end_timestamp(self): results = list(self.conn.get_volume_max(f)) assert results == expected + + +def test_model_table_args(): + cfg.CONF.database_connection = 'mysql://localhost' + assert table_args()