Merge "Remove unicode prefixes"

12 files changed, 495 insertions, 495 deletions

diff --git a/ceilometer/compute/pollsters/util.py b/ceilometer/compute/pollsters/util.py
index a0ac83b7..1c708dfc 100644
--- a/ceilometer/compute/pollsters/util.py
+++ b/ceilometer/compute/pollsters/util.py
@@ -34,15 +34,15 @@ def _get_metadata_from_object(conf, instance):
     instance_type = instance.flavor['name'] if instance.flavor else None
     metadata = {
         'display_name': instance.name,
-        'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', u''),
+        'name': getattr(instance, 'OS-EXT-SRV-ATTR:instance_name', ''),
         'instance_id': instance.id,
         'instance_type': instance_type,
         'host': instance.hostId,
-        'instance_host': getattr(instance, 'OS-EXT-SRV-ATTR:host', u''),
+        'instance_host': getattr(instance, 'OS-EXT-SRV-ATTR:host', ''),
         'flavor': instance.flavor,
         'status': instance.status.lower(),
-        'state': getattr(instance, 'OS-EXT-STS:vm_state', u''),
-        'task_state': getattr(instance, 'OS-EXT-STS:task_state', u''),
+        'state': getattr(instance, 'OS-EXT-STS:vm_state', ''),
+        'task_state': getattr(instance, 'OS-EXT-STS:task_state', ''),
     }
 
     # Image properties
diff --git a/ceilometer/tests/unit/event/test_endpoint.py b/ceilometer/tests/unit/event/test_endpoint.py
index 05583950..6011d456 100644
--- a/ceilometer/tests/unit/event/test_endpoint.py
+++ b/ceilometer/tests/unit/event/test_endpoint.py
@@ -28,54 +28,54 @@ from ceilometer.tests import base as tests_base
 
 
 TEST_NOTICE_CTXT = {
-    u'auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2',
-    u'is_admin': True,
-    u'project_id': u'7c150a59fe714e6f9263774af9688f0e',
-    u'quota_class': None,
-    u'read_deleted': u'no',
-    u'remote_address': u'10.0.2.15',
-    u'request_id': u'req-d68b36e0-9233-467f-9afb-d81435d64d66',
-    u'roles': [u'admin'],
-    u'timestamp': u'2012-05-08T20:23:41.425105',
-    u'user_id': u'1e3ce043029547f1a61c1996d1a531a2',
+    'auth_token': '3d8b13de1b7d499587dfc69b77dc09c2',
+    'is_admin': True,
+    'project_id': '7c150a59fe714e6f9263774af9688f0e',
+    'quota_class': None,
+    'read_deleted': 'no',
+    'remote_address': '10.0.2.15',
+    'request_id': 'req-d68b36e0-9233-467f-9afb-d81435d64d66',
+    'roles': ['admin'],
+    'timestamp': '2012-05-08T20:23:41.425105',
+    'user_id': '1e3ce043029547f1a61c1996d1a531a2',
 }
 
 TEST_NOTICE_METADATA = {
-    u'message_id': u'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
-    u'timestamp': u'2012-05-08 20:23:48.028195',
+    'message_id': 'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
+    'timestamp': '2012-05-08 20:23:48.028195',
 }
 
 TEST_NOTICE_PAYLOAD = {
-    u'created_at': u'2012-05-08 20:23:41',
-    u'deleted_at': u'',
-    u'disk_gb': 0,
-    u'display_name': u'testme',
-    u'fixed_ips': [{u'address': u'10.0.0.2',
-                    u'floating_ips': [],
-                    u'meta': {},
-                    u'type': u'fixed',
-                    u'version': 4}],
-    u'image_ref_url': u'http://10.0.2.15:9292/images/UUID',
-    u'instance_id': u'9f9d01b9-4a58-4271-9e27-398b21ab20d1',
-    u'instance_type': u'm1.tiny',
-    u'instance_type_id': 2,
-    u'launched_at': u'2012-05-08 20:23:47.985999',
-    u'memory_mb': 512,
-    u'state': u'active',
-    u'state_description': u'',
-    u'tenant_id': u'7c150a59fe714e6f9263774af9688f0e',
-    u'user_id': u'1e3ce043029547f1a61c1996d1a531a2',
-    u'reservation_id': u'1e3ce043029547f1a61c1996d1a531a3',
-    u'vcpus': 1,
-    u'root_gb': 0,
-    u'ephemeral_gb': 0,
-    u'host': u'compute-host-name',
-    u'availability_zone': u'1e3ce043029547f1a61c1996d1a531a4',
-    u'os_type': u'linux?',
-    u'architecture': u'x86',
-    u'image_ref': u'UUID',
-    u'kernel_id': u'1e3ce043029547f1a61c1996d1a531a5',
-    u'ramdisk_id': u'1e3ce043029547f1a61c1996d1a531a6',
+    'created_at': '2012-05-08 20:23:41',
+    'deleted_at': '',
+    'disk_gb': 0,
+    'display_name': 'testme',
+    'fixed_ips': [{'address': '10.0.0.2',
+                    'floating_ips': [],
+                    'meta': {},
+                    'type': 'fixed',
+                    'version': 4}],
+    'image_ref_url': 'http://10.0.2.15:9292/images/UUID',
+    'instance_id': '9f9d01b9-4a58-4271-9e27-398b21ab20d1',
+    'instance_type': 'm1.tiny',
+    'instance_type_id': 2,
+    'launched_at': '2012-05-08 20:23:47.985999',
+    'memory_mb': 512,
+    'state': 'active',
+    'state_description': '',
+    'tenant_id': '7c150a59fe714e6f9263774af9688f0e',
+    'user_id': '1e3ce043029547f1a61c1996d1a531a2',
+    'reservation_id': '1e3ce043029547f1a61c1996d1a531a3',
+    'vcpus': 1,
+    'root_gb': 0,
+    'ephemeral_gb': 0,
+    'host': 'compute-host-name',
+    'availability_zone': '1e3ce043029547f1a61c1996d1a531a4',
+    'os_type': 'linux?',
+    'architecture': 'x86',
+    'image_ref': 'UUID',
+    'kernel_id': '1e3ce043029547f1a61c1996d1a531a5',
+    'ramdisk_id': '1e3ce043029547f1a61c1996d1a531a6',
 }
 
 
diff --git a/ceilometer/tests/unit/image/test_glance.py b/ceilometer/tests/unit/image/test_glance.py
index 48d35960..423eb481 100644
--- a/ceilometer/tests/unit/image/test_glance.py
+++ b/ceilometer/tests/unit/image/test_glance.py
@@ -20,64 +20,64 @@ import ceilometer.tests.base as base
 
 IMAGE_LIST = [
     type('Image', (object,),
-         {u'status': u'active',
-          u'tags': [],
-          u'kernel_id': u'fd24d91a-dfd5-4a3c-b990-d4563eb27396',
-          u'container_format': u'ami',
-          u'min_ram': 0,
-          u'ramdisk_id': u'd629522b-ebaa-4c92-9514-9e31fe760d18',
-          u'updated_at': u'2016-06-20T13: 34: 41Z',
-          u'visibility': u'public',
-          u'owner': u'6824974c08974d4db864bbaa6bc08303',
-          u'file': u'/v2/images/fda54a44-3f96-40bf-ab07-0a4ce9e1761d/file',
-          u'min_disk': 0,
-          u'virtual_size': None,
-          u'id': u'fda54a44-3f96-40bf-ab07-0a4ce9e1761d',
-          u'size': 25165824,
-          u'name': u'cirros-0.3.4-x86_64-uec',
-          u'checksum': u'eb9139e4942121f22bbc2afc0400b2a4',
-          u'created_at': u'2016-06-20T13: 34: 40Z',
-          u'disk_format': u'ami',
-          u'protected': False,
-          u'schema': u'/v2/schemas/image'}),
+         {'status': 'active',
+          'tags': [],
+          'kernel_id': 'fd24d91a-dfd5-4a3c-b990-d4563eb27396',
+          'container_format': 'ami',
+          'min_ram': 0,
+          'ramdisk_id': 'd629522b-ebaa-4c92-9514-9e31fe760d18',
+          'updated_at': '2016-06-20T13: 34: 41Z',
+          'visibility': 'public',
+          'owner': '6824974c08974d4db864bbaa6bc08303',
+          'file': '/v2/images/fda54a44-3f96-40bf-ab07-0a4ce9e1761d/file',
+          'min_disk': 0,
+          'virtual_size': None,
+          'id': 'fda54a44-3f96-40bf-ab07-0a4ce9e1761d',
+          'size': 25165824,
+          'name': 'cirros-0.3.4-x86_64-uec',
+          'checksum': 'eb9139e4942121f22bbc2afc0400b2a4',
+          'created_at': '2016-06-20T13: 34: 40Z',
+          'disk_format': 'ami',
+          'protected': False,
+          'schema': '/v2/schemas/image'}),
     type('Image', (object,),
-         {u'status': u'active',
-          u'tags': [],
-          u'container_format': u'ari',
-          u'min_ram': 0,
-          u'updated_at': u'2016-06-20T13: 34: 38Z',
-          u'visibility': u'public',
-          u'owner': u'6824974c08974d4db864bbaa6bc08303',
-          u'file': u'/v2/images/d629522b-ebaa-4c92-9514-9e31fe760d18/file',
-          u'min_disk': 0,
-          u'virtual_size': None,
-          u'id': u'd629522b-ebaa-4c92-9514-9e31fe760d18',
-          u'size': 3740163,
-          u'name': u'cirros-0.3.4-x86_64-uec-ramdisk',
-          u'checksum': u'be575a2b939972276ef675752936977f',
-          u'created_at': u'2016-06-20T13: 34: 37Z',
-          u'disk_format': u'ari',
-          u'protected': False,
-          u'schema': u'/v2/schemas/image'}),
+         {'status': 'active',
+          'tags': [],
+          'container_format': 'ari',
+          'min_ram': 0,
+          'updated_at': '2016-06-20T13: 34: 38Z',
+          'visibility': 'public',
+          'owner': '6824974c08974d4db864bbaa6bc08303',
+          'file': '/v2/images/d629522b-ebaa-4c92-9514-9e31fe760d18/file',
+          'min_disk': 0,
+          'virtual_size': None,
+          'id': 'd629522b-ebaa-4c92-9514-9e31fe760d18',
+          'size': 3740163,
+          'name': 'cirros-0.3.4-x86_64-uec-ramdisk',
+          'checksum': 'be575a2b939972276ef675752936977f',
+          'created_at': '2016-06-20T13: 34: 37Z',
+          'disk_format': 'ari',
+          'protected': False,
+          'schema': '/v2/schemas/image'}),
     type('Image', (object,),
-         {u'status': u'active',
-          u'tags': [],
-          u'container_format': u'aki',
-          u'min_ram': 0,
-          u'updated_at': u'2016-06-20T13: 34: 35Z',
-          u'visibility': u'public',
-          u'owner': u'6824974c08974d4db864bbaa6bc08303',
-          u'file': u'/v2/images/fd24d91a-dfd5-4a3c-b990-d4563eb27396/file',
-          u'min_disk': 0,
-          u'virtual_size': None,
-          u'id': u'fd24d91a-dfd5-4a3c-b990-d4563eb27396',
-          u'size': 4979632,
-          u'name': u'cirros-0.3.4-x86_64-uec-kernel',
-          u'checksum': u'8a40c862b5735975d82605c1dd395796',
-          u'created_at': u'2016-06-20T13: 34: 35Z',
-          u'disk_format': u'aki',
-          u'protected': False,
-          u'schema': u'/v2/schemas/image'}),
+         {'status': 'active',
+          'tags': [],
+          'container_format': 'aki',
+          'min_ram': 0,
+          'updated_at': '2016-06-20T13: 34: 35Z',
+          'visibility': 'public',
+          'owner': '6824974c08974d4db864bbaa6bc08303',
+          'file': '/v2/images/fd24d91a-dfd5-4a3c-b990-d4563eb27396/file',
+          'min_disk': 0,
+          'virtual_size': None,
+          'id': 'fd24d91a-dfd5-4a3c-b990-d4563eb27396',
+          'size': 4979632,
+          'name': 'cirros-0.3.4-x86_64-uec-kernel',
+          'checksum': '8a40c862b5735975d82605c1dd395796',
+          'created_at': '2016-06-20T13: 34: 35Z',
+          'disk_format': 'aki',
+          'protected': False,
+          'schema': '/v2/schemas/image'}),
 ]
 
 
diff --git a/ceilometer/tests/unit/meter/test_notifications.py b/ceilometer/tests/unit/meter/test_notifications.py
index ea3299c3..d1dec075 100644
--- a/ceilometer/tests/unit/meter/test_notifications.py
+++ b/ceilometer/tests/unit/meter/test_notifications.py
@@ -25,71 +25,71 @@ from ceilometer import service as ceilometer_service
 from ceilometer.tests import base as test
 
 NOTIFICATION = {
-    'event_type': u'test.create',
-    'metadata': {'timestamp': u'2015-06-19T09:19:35.786893',
-                 'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'},
-    'payload': {u'user_id': u'e1d870e51c7340cb9d555b15cbfcaec2',
-                u'resource_id': u'bea70e51c7340cb9d555b15cbfcaec23',
-                u'timestamp': u'2015-06-19T09:19:35.785330',
-                u'created_at': u'2015-06-19T09:25:35.785330',
-                u'launched_at': u'2015-06-19T09:25:40.785330',
-                u'message_signature': u'fake_signature1',
-                u'resource_metadata': {u'foo': u'bar'},
-                u'source': u'30be1fc9a03c4e94ab05c403a8a377f2: openstack',
-                u'volume': 1.0,
-                u'project_id': u'30be1fc9a03c4e94ab05c403a8a377f2',
+    'event_type': 'test.create',
+    'metadata': {'timestamp': '2015-06-19T09:19:35.786893',
+                 'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e'},
+    'payload': {'user_id': 'e1d870e51c7340cb9d555b15cbfcaec2',
+                'resource_id': 'bea70e51c7340cb9d555b15cbfcaec23',
+                'timestamp': '2015-06-19T09:19:35.785330',
+                'created_at': '2015-06-19T09:25:35.785330',
+                'launched_at': '2015-06-19T09:25:40.785330',
+                'message_signature': 'fake_signature1',
+                'resource_metadata': {'foo': 'bar'},
+                'source': '30be1fc9a03c4e94ab05c403a8a377f2: openstack',
+                'volume': 1.0,
+                'project_id': '30be1fc9a03c4e94ab05c403a8a377f2',
                 },
-    'ctxt': {u'tenant': u'30be1fc9a03c4e94ab05c403a8a377f2',
-             u'request_id': u'req-da91b4bf-d2b5-43ae-8b66-c7752e72726d',
-             u'user': u'e1d870e51c7340cb9d555b15cbfcaec2'},
+    'ctxt': {'tenant': '30be1fc9a03c4e94ab05c403a8a377f2',
+             'request_id': 'req-da91b4bf-d2b5-43ae-8b66-c7752e72726d',
+             'user': 'e1d870e51c7340cb9d555b15cbfcaec2'},
     'publisher_id': "foo123"
 }
 
 USER_META = {
-    'event_type': u'test.create',
-    'metadata': {'timestamp': u'2015-06-19T09:19:35.786893',
-                 'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'},
-    'payload': {u'user_id': u'e1d870e51c7340cb9d555b15cbfcaec2',
-                u'resource_id': u'bea70e51c7340cb9d555b15cbfcaec23',
-                u'timestamp': u'2015-06-19T09:19:35.785330',
-                u'created_at': u'2015-06-19T09:25:35.785330',
-                u'launched_at': u'2015-06-19T09:25:40.785330',
-                u'message_signature': u'fake_signature1',
-                u'resource_metadata': {u'foo': u'bar'},
-                u'source': u'30be1fc9a03c4e94ab05c403a8a377f2: openstack',
-                u'volume': 1.0,
-                u'project_id': u'30be1fc9a03c4e94ab05c403a8a377f2',
-                u'metadata': {u'metering.xyz': u'abc', u'ignore': u'this'},
+    'event_type': 'test.create',
+    'metadata': {'timestamp': '2015-06-19T09:19:35.786893',
+                 'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e'},
+    'payload': {'user_id': 'e1d870e51c7340cb9d555b15cbfcaec2',
+                'resource_id': 'bea70e51c7340cb9d555b15cbfcaec23',
+                'timestamp': '2015-06-19T09:19:35.785330',
+                'created_at': '2015-06-19T09:25:35.785330',
+                'launched_at': '2015-06-19T09:25:40.785330',
+                'message_signature': 'fake_signature1',
+                'resource_metadata': {'foo': 'bar'},
+                'source': '30be1fc9a03c4e94ab05c403a8a377f2: openstack',
+                'volume': 1.0,
+                'project_id': '30be1fc9a03c4e94ab05c403a8a377f2',
+                'metadata': {'metering.xyz': 'abc', 'ignore': 'this'},
                 },
-    'ctxt': {u'tenant': u'30be1fc9a03c4e94ab05c403a8a377f2',
-             u'request_id': u'req-da91b4bf-d2b5-43ae-8b66-c7752e72726d',
-             u'user': u'e1d870e51c7340cb9d555b15cbfcaec2'},
+    'ctxt': {'tenant': '30be1fc9a03c4e94ab05c403a8a377f2',
+             'request_id': 'req-da91b4bf-d2b5-43ae-8b66-c7752e72726d',
+             'user': 'e1d870e51c7340cb9d555b15cbfcaec2'},
     'publisher_id': "foo123"
 }
 
 MIDDLEWARE_EVENT = {
-    u'ctxt': {u'request_id': u'req-a8bfa89b-d28b-4b95-9e4b-7d7875275650',
-              u'quota_class': None,
-              u'service_catalog': [],
-              u'auth_token': None,
-              u'user_id': None,
-              u'is_admin': True,
-              u'user': None,
-              u'remote_address': None,
-              u'roles': [],
-              u'timestamp': u'2013-07-29T06:51:34.348091',
-              u'project_name': None,
-              u'read_deleted': u'no',
-              u'tenant': None,
-              u'instance_lock_checked': False,
-              u'project_id': None,
-              u'user_name': None},
-    u'event_type': u'objectstore.http.request',
-    u'publisher_id': u'ceilometermiddleware',
-    u'metadata': {u'message_id': u'6eccedba-120e-4db8-9735-2ad5f061e5ee',
-                  u'timestamp': u'2013-07-29T06:51:34.474815+00:00',
-                  u'_unique_id': u'0ee26117077648e18d88ac76e28a72e2'},
-    u'payload': {
+    'ctxt': {'request_id': 'req-a8bfa89b-d28b-4b95-9e4b-7d7875275650',
+             'quota_class': None,
+             'service_catalog': [],
+             'auth_token': None,
+             'user_id': None,
+             'is_admin': True,
+             'user': None,
+             'remote_address': None,
+             'roles': [],
+             'timestamp': '2013-07-29T06:51:34.348091',
+             'project_name': None,
+             'read_deleted': 'no',
+             'tenant': None,
+             'instance_lock_checked': False,
+             'project_id': None,
+             'user_name': None},
+    'event_type': 'objectstore.http.request',
+    'publisher_id': 'ceilometermiddleware',
+    'metadata': {'message_id': '6eccedba-120e-4db8-9735-2ad5f061e5ee',
+                  'timestamp': '2013-07-29T06:51:34.474815+00:00',
+                  '_unique_id': '0ee26117077648e18d88ac76e28a72e2'},
+    'payload': {
         'typeURI': 'http: //schemas.dmtf.org/cloud/audit/1.0/event',
         'eventTime': '2013-07-29T06:51:34.474815+00:00',
         'target': {
@@ -137,99 +137,99 @@ MIDDLEWARE_EVENT = {
 }
 
 FULL_MULTI_MSG = {
-    'event_type': u'full.sample',
+    'event_type': 'full.sample',
     'payload': [{
-                u'counter_name': u'instance1',
-                u'user_id': u'user1',
-                u'resource_id': u'res1',
-                u'counter_unit': u'ns',
-                u'counter_volume': 28.0,
-                u'project_id': u'proj1',
-                u'counter_type': u'gauge'
+                'counter_name': 'instance1',
+                'user_id': 'user1',
+                'resource_id': 'res1',
+                'counter_unit': 'ns',
+                'counter_volume': 28.0,
+                'project_id': 'proj1',
+                'counter_type': 'gauge'
                 },
                 {
-                u'counter_name': u'instance2',
-                u'user_id': u'user2',
-                u'resource_id': u'res2',
-                u'counter_unit': u'%',
-                u'counter_volume': 1.0,
-                u'project_id': u'proj2',
-                u'counter_type': u'delta'
+                'counter_name': 'instance2',
+                'user_id': 'user2',
+                'resource_id': 'res2',
+                'counter_unit': '%',
+                'counter_volume': 1.0,
+                'project_id': 'proj2',
+                'counter_type': 'delta'
                 }],
-    u'ctxt': {u'domain': None,
-              u'request_id': u'req-da91b4bf-d2b5-43ae-8b66-c7752e72726d',
-              u'auth_token': None,
-              u'read_only': False,
-              u'resource_uuid': None,
-              u'user_identity': u'fake_user_identity---',
-              u'show_deleted': False,
-              u'tenant': u'30be1fc9a03c4e94ab05c403a8a377f2',
-              u'is_admin': True,
-              u'project_domain': None,
-              u'user': u'e1d870e51c7340cb9d555b15cbfcaec2',
-              u'user_domain': None},
-    'publisher_id': u'ceilometer.api',
-    'metadata': {'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e',
-                 'timestamp': u'2015-06-19T09:19:35.786893'},
+    'ctxt': {'domain': None,
+             'request_id': 'req-da91b4bf-d2b5-43ae-8b66-c7752e72726d',
+             'auth_token': None,
+             'read_only': False,
+             'resource_uuid': None,
+             'user_identity': 'fake_user_identity---',
+             'show_deleted': False,
+             'tenant': '30be1fc9a03c4e94ab05c403a8a377f2',
+             'is_admin': True,
+             'project_domain': None,
+             'user': 'e1d870e51c7340cb9d555b15cbfcaec2',
+             'user_domain': None},
+    'publisher_id': 'ceilometer.api',
+    'metadata': {'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e',
+                 'timestamp': '2015-06-19T09:19:35.786893'},
 }
 
 METRICS_UPDATE = {
-    u'event_type': u'compute.metrics.update',
-    u'payload': {
-        u'metrics': [
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+    'event_type': 'compute.metrics.update',
+    'payload': {
+        'metrics': [
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.frequency', 'value': 1600,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.user.time', 'value': 17421440000000,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.kernel.time', 'value': 7852600000000,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.idle.time', 'value': 1307374400000000,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.iowait.time', 'value': 11697470000000,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.user.percent', 'value': 0.012959045637294348,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.kernel.percent', 'value': 0.005841204961898534,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.idle.percent', 'value': 0.9724985141658965,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.iowait.percent', 'value': 0.008701235234910634,
              'source': 'libvirt.LibvirtDriver'},
-            {'timestamp': u'2013-07-29T06:51:34.472416',
+            {'timestamp': '2013-07-29T06:51:34.472416',
              'name': 'cpu.percent', 'value': 0.027501485834103515,
              'source': 'libvirt.LibvirtDriver'}],
-        u'nodename': u'tianst.sh.intel.com',
-        u'host': u'tianst',
-        u'host_id': u'10.0.1.1'},
-    u'publisher_id': u'compute.tianst.sh.intel.com',
-    u'metadata': {u'message_id': u'6eccedba-120e-4db8-9735-2ad5f061e5ee',
-                  u'timestamp': u'2013-07-29 06:51:34.474815',
-                  u'_unique_id': u'0ee26117077648e18d88ac76e28a72e2'},
-    u'ctxt': {u'request_id': u'req-a8bfa89b-d28b-4b95-9e4b-7d7875275650',
-              u'quota_class': None,
-              u'service_catalog': [],
-              u'auth_token': None,
-              u'user_id': None,
-              u'is_admin': True,
-              u'user': None,
-              u'remote_address': None,
-              u'roles': [],
-              u'timestamp': u'2013-07-29T06:51:34.348091',
-              u'project_name': None,
-              u'read_deleted': u'no',
-              u'tenant': None,
-              u'instance_lock_checked': False,
-              u'project_id': None,
-              u'user_name': None}
+        'nodename': 'tianst.sh.intel.com',
+        'host': 'tianst',
+        'host_id': '10.0.1.1'},
+    'publisher_id': 'compute.tianst.sh.intel.com',
+    'metadata': {'message_id': '6eccedba-120e-4db8-9735-2ad5f061e5ee',
+                 'timestamp': '2013-07-29 06:51:34.474815',
+                 '_unique_id': '0ee26117077648e18d88ac76e28a72e2'},
+    'ctxt': {'request_id': 'req-a8bfa89b-d28b-4b95-9e4b-7d7875275650',
+             'quota_class': None,
+             'service_catalog': [],
+             'auth_token': None,
+             'user_id': None,
+             'is_admin': True,
+             'user': None,
+             'remote_address': None,
+             'roles': [],
+             'timestamp': '2013-07-29T06:51:34.348091',
+             'project_name': None,
+             'read_deleted': 'no',
+             'tenant': None,
+             'instance_lock_checked': False,
+             'project_id': None,
+             'user_name': None}
 }
 
 
diff --git a/ceilometer/tests/unit/polling/test_discovery.py b/ceilometer/tests/unit/polling/test_discovery.py
index a04301c5..6414c874 100644
--- a/ceilometer/tests/unit/polling/test_discovery.py
+++ b/ceilometer/tests/unit/polling/test_discovery.py
@@ -77,15 +77,15 @@ class TestProjectDiscovery(base.BaseTestCase):
         domain_heat.name = 'heat'
         domain_heat.enabled = True
         domain_heat.links = {
-            u'self': u'http://192.168.1.1/identity/v3/domains/'
-                     u'2f42ab40b7ad4140815ef830d816a16c'}
+            'self': 'http://192.168.1.1/identity/v3/domains/'
+                    '2f42ab40b7ad4140815ef830d816a16c'}
 
         domain_default = mock.MagicMock()
         domain_default.id = 'default'
         domain_default.name = 'Default'
         domain_default.enabled = True
         domain_default.links = {
-            u'self': u'http://192.168.1.1/identity/v3/domains/default'}
+            'self': 'http://192.168.1.1/identity/v3/domains/default'}
 
         project_admin = mock.MagicMock()
         project_admin.id = '2ce92449a23145ef9c539f3327960ce3'
@@ -95,8 +95,8 @@ class TestProjectDiscovery(base.BaseTestCase):
         project_admin.is_domain = False
         project_admin.enabled = True
         project_admin.links = {
-            u'self': u'http://192.168.4.46/identity/v3/projects/'
-                     u'2ce92449a23145ef9c539f3327960ce3'},
+            'self': 'http://192.168.4.46/identity/v3/projects/'
+                    '2ce92449a23145ef9c539f3327960ce3'},
 
         project_service = mock.MagicMock()
         project_service.id = '9bf93b86bca04e3b815f86a5de083adc'
@@ -106,8 +106,8 @@ class TestProjectDiscovery(base.BaseTestCase):
         project_service.is_domain = False
         project_service.enabled = True
         project_service.links = {
-            u'self': u'http://192.168.4.46/identity/v3/projects/'
-                     u'9bf93b86bca04e3b815f86a5de083adc'}
+            'self': 'http://192.168.4.46/identity/v3/projects/'
+                    '9bf93b86bca04e3b815f86a5de083adc'}
 
         project_demo = mock.MagicMock()
         project_demo.id = '57d96b9af18d43bb9d047f436279b0be'
@@ -117,8 +117,8 @@ class TestProjectDiscovery(base.BaseTestCase):
         project_demo.is_domain = False
         project_demo.enabled = True
         project_demo.links = {
-            u'self': u'http://192.168.4.46/identity/v3/projects/'
-                     u'57d96b9af18d43bb9d047f436279b0be'}
+            'self': 'http://192.168.4.46/identity/v3/projects/'
+                    '57d96b9af18d43bb9d047f436279b0be'}
 
         self.domains = [domain_heat, domain_default]
         self.default_domain_projects = [project_admin, project_service]
diff --git a/ceilometer/tests/unit/publisher/test_gnocchi.py b/ceilometer/tests/unit/publisher/test_gnocchi.py
index dcaf8c11..236da69b 100644
--- a/ceilometer/tests/unit/publisher/test_gnocchi.py
+++ b/ceilometer/tests/unit/publisher/test_gnocchi.py
@@ -38,162 +38,162 @@ from ceilometer.tests import base
 load_tests = testscenarios.load_tests_apply_scenarios
 
 INSTANCE_DELETE_START = models.Event(
-    event_type=u'compute.instance.delete.start',
-    traits=[models.Trait('state', 1, u'active'),
+    event_type='compute.instance.delete.start',
+    traits=[models.Trait('state', 1, 'active'),
             models.Trait(
-                'user_id', 1, u'1e3ce043029547f1a61c1996d1a531a2'),
-            models.Trait('service', 1, u'compute'),
-            models.Trait('availability_zone', 1, u'zone1'),
+                'user_id', 1, '1e3ce043029547f1a61c1996d1a531a2'),
+            models.Trait('service', 1, 'compute'),
+            models.Trait('availability_zone', 1, 'zone1'),
             models.Trait('disk_gb', 2, 0),
-            models.Trait('instance_type', 1, u'm1.tiny'),
-            models.Trait('tenant_id', 1, u'7c150a59fe714e6f9263774af9688f0e'),
+            models.Trait('instance_type', 1, 'm1.tiny'),
+            models.Trait('tenant_id', 1, '7c150a59fe714e6f9263774af9688f0e'),
             models.Trait('root_gb', 2, 0),
             models.Trait('ephemeral_gb', 2, 0),
-            models.Trait('instance_type_id', 2, u'2'),
+            models.Trait('instance_type_id', 2, '2'),
             models.Trait('vcpus', 2, 1),
             models.Trait('memory_mb', 2, 512),
             models.Trait(
-                'instance_id', 1, u'9f9d01b9-4a58-4271-9e27-398b21ab20d1'),
-            models.Trait('host', 1, u'vagrant-precise'),
+                'instance_id', 1, '9f9d01b9-4a58-4271-9e27-398b21ab20d1'),
+            models.Trait('host', 1, 'vagrant-precise'),
             models.Trait(
-                'request_id', 1, u'req-fb3c4546-a2e5-49b7-9fd2-a63bd658bc39'),
-            models.Trait('project_id', 1, u'7c150a59fe714e6f9263774af9688f0e'),
+                'request_id', 1, 'req-fb3c4546-a2e5-49b7-9fd2-a63bd658bc39'),
+            models.Trait('project_id', 1, '7c150a59fe714e6f9263774af9688f0e'),
             models.Trait('launched_at', 4, '2012-05-08T20:23:47')],
     raw={},
     generated='2012-05-08T20:24:14.824743',
-    message_id=u'a15b94ee-cb8e-4c71-9abe-14aa80055fb4',
+    message_id='a15b94ee-cb8e-4c71-9abe-14aa80055fb4',
 )
 
 INSTANCE_CREATE_END = models.Event(
-    event_type=u'compute.instance.create.end',
-    traits=[models.Trait('state', 1, u'active'),
+    event_type='compute.instance.create.end',
+    traits=[models.Trait('state', 1, 'active'),
             models.Trait(
-                'user_id', 1, u'1e3ce043029547f1a61c1996d1a531a2'),
-            models.Trait('service', 1, u'compute'),
-            models.Trait('availability_zone', 1, u'zone1'),
+                'user_id', 1, '1e3ce043029547f1a61c1996d1a531a2'),
+            models.Trait('service', 1, 'compute'),
+            models.Trait('availability_zone', 1, 'zone1'),
             models.Trait('disk_gb', 2, 0),
-            models.Trait('instance_type', 1, u'm1.tiny'),
-            models.Trait('tenant_id', 1, u'7c150a59fe714e6f9263774af9688f0e'),
+            models.Trait('instance_type', 1, 'm1.tiny'),
+            models.Trait('tenant_id', 1, '7c150a59fe714e6f9263774af9688f0e'),
             models.Trait('root_gb', 2, 0),
             models.Trait('ephemeral_gb', 2, 0),
-            models.Trait('instance_type_id', 2, u'2'),
+            models.Trait('instance_type_id', 2, '2'),
             models.Trait('vcpus', 2, 1),
             models.Trait('memory_mb', 2, 512),
             models.Trait(
-                'instance_id', 1, u'9f9d01b9-4a58-4271-9e27-398b21ab20d1'),
-            models.Trait('host', 1, u'vagrant-precise'),
+                'instance_id', 1, '9f9d01b9-4a58-4271-9e27-398b21ab20d1'),
+            models.Trait('host', 1, 'vagrant-precise'),
             models.Trait(
-                'request_id', 1, u'req-fb3c4546-a2e5-49b7-9fd2-a63bd658bc39'),
-            models.Trait('project_id', 1, u'7c150a59fe714e6f9263774af9688f0e'),
+                'request_id', 1, 'req-fb3c4546-a2e5-49b7-9fd2-a63bd658bc39'),
+            models.Trait('project_id', 1, '7c150a59fe714e6f9263774af9688f0e'),
             models.Trait('launched_at', 4, '2012-05-08T20:23:47')],
     raw={},
     generated='2012-05-08T20:24:14.824743',
-    message_id=u'202f745e-4913-11e9-affe-9797342bd3a8',
+    message_id='202f745e-4913-11e9-affe-9797342bd3a8',
 )
 
 IMAGE_DELETE_START = models.Event(
-    event_type=u'image.delete',
-    traits=[models.Trait(u'status', 1, u'deleted'),
-            models.Trait(u'deleted_at', 1, u'2016-11-04T04:25:56Z'),
-            models.Trait(u'user_id', 1, u'e97ef33a20ed4843b520d223f3cc33d4'),
-            models.Trait(u'name', 1, u'cirros'),
-            models.Trait(u'service', 1, u'image.localhost'),
+    event_type='image.delete',
+    traits=[models.Trait('status', 1, 'deleted'),
+            models.Trait('deleted_at', 1, '2016-11-04T04:25:56Z'),
+            models.Trait('user_id', 1, 'e97ef33a20ed4843b520d223f3cc33d4'),
+            models.Trait('name', 1, 'cirros'),
+            models.Trait('service', 1, 'image.localhost'),
             models.Trait(
-                u'resource_id', 1, u'dc337359-de70-4044-8e2c-80573ba6e577'),
-            models.Trait(u'created_at', 1, u'2016-11-04T04:24:36Z'),
+                'resource_id', 1, 'dc337359-de70-4044-8e2c-80573ba6e577'),
+            models.Trait('created_at', 1, '2016-11-04T04:24:36Z'),
             models.Trait(
-                u'project_id', 1, u'e97ef33a20ed4843b520d223f3cc33d4'),
-            models.Trait(u'size', 1, u'13287936')],
+                'project_id', 1, 'e97ef33a20ed4843b520d223f3cc33d4'),
+            models.Trait('size', 1, '13287936')],
     raw={},
-    generated=u'2016-11-04T04:25:56.493820',
-    message_id=u'7f5280f7-1d10-46a5-ba58-4d5508e49f99'
+    generated='2016-11-04T04:25:56.493820',
+    message_id='7f5280f7-1d10-46a5-ba58-4d5508e49f99'
 )
 
 
 VOLUME_DELETE_END = models.Event(
-    event_type=u'volume.delete.end',
-    traits=[models.Trait(u'availability_zone', 1, u'nova'),
-            models.Trait(u'created_at', 1, u'2016-11-28T13:19:53+00:00'),
-            models.Trait(u'display_name', 1, u'vol-001'),
+    event_type='volume.delete.end',
+    traits=[models.Trait('availability_zone', 1, 'nova'),
+            models.Trait('created_at', 1, '2016-11-28T13:19:53+00:00'),
+            models.Trait('display_name', 1, 'vol-001'),
             models.Trait(
-                u'host', 1, u'zhangguoqing-dev@lvmdriver-1#lvmdriver-1'),
+                'host', 1, 'zhangguoqing-dev@lvmdriver-1#lvmdriver-1'),
             models.Trait(
-                u'project_id', 1, u'd53fcc7dc53c4662ad77822c36a21f00'),
-            models.Trait(u'replication_status', 1, u'disabled'),
+                'project_id', 1, 'd53fcc7dc53c4662ad77822c36a21f00'),
+            models.Trait('replication_status', 1, 'disabled'),
             models.Trait(
-                u'request_id', 1, u'req-f44df096-50d4-4211-95ea-64be6f5e4f60'),
+                'request_id', 1, 'req-f44df096-50d4-4211-95ea-64be6f5e4f60'),
             models.Trait(
-                u'resource_id', 1, u'6cc6e7dd-d17d-460f-ae79-7e08a216ce96'),
+                'resource_id', 1, '6cc6e7dd-d17d-460f-ae79-7e08a216ce96'),
             models.Trait(
-                u'service', 1, u'volume.zhangguoqing-dev@lvmdriver-1'),
-            models.Trait(u'size', 1, u'1'),
-            models.Trait(u'status', 1, u'deleting'),
-            models.Trait(u'tenant_id', 1, u'd53fcc7dc53c4662ad77822c36a21f00'),
-            models.Trait(u'type', 1, u'af6271fa-13c4-44e6-9246-754ce9dc7df8'),
-            models.Trait(u'user_id', 1, u'819bbd28f5374506b8502521c89430b5')],
+                'service', 1, 'volume.zhangguoqing-dev@lvmdriver-1'),
+            models.Trait('size', 1, '1'),
+            models.Trait('status', 1, 'deleting'),
+            models.Trait('tenant_id', 1, 'd53fcc7dc53c4662ad77822c36a21f00'),
+            models.Trait('type', 1, 'af6271fa-13c4-44e6-9246-754ce9dc7df8'),
+            models.Trait('user_id', 1, '819bbd28f5374506b8502521c89430b5')],
     raw={},
     generated='2016-11-28T13:42:15.484674',
-    message_id=u'a15b94ee-cb8e-4c71-9abe-14aa80055fb4',
+    message_id='a15b94ee-cb8e-4c71-9abe-14aa80055fb4',
 )
 
 FLOATINGIP_DELETE_END = models.Event(
-    event_type=u'floatingip.delete.end',
-    traits=[models.Trait(u'service', 1, u'network.zhangguoqing-dev'),
+    event_type='floatingip.delete.end',
+    traits=[models.Trait('service', 1, 'network.zhangguoqing-dev'),
             models.Trait(
-                u'project_id', 1, u'd53fcc7dc53c4662ad77822c36a21f00'),
+                'project_id', 1, 'd53fcc7dc53c4662ad77822c36a21f00'),
             models.Trait(
-                u'request_id', 1, 'req-443ddb77-31f7-41fe-abbf-921107dd9f00'),
+                'request_id', 1, 'req-443ddb77-31f7-41fe-abbf-921107dd9f00'),
             models.Trait(
-                u'resource_id', 1, u'705e2c08-08e8-45cb-8673-5c5be955569b'),
-            models.Trait(u'tenant_id', 1, u'd53fcc7dc53c4662ad77822c36a21f00'),
-            models.Trait(u'user_id', 1, u'819bbd28f5374506b8502521c89430b5')],
+                'resource_id', 1, '705e2c08-08e8-45cb-8673-5c5be955569b'),
+            models.Trait('tenant_id', 1, 'd53fcc7dc53c4662ad77822c36a21f00'),
+            models.Trait('user_id', 1, '819bbd28f5374506b8502521c89430b5')],
     raw={},
     generated='2016-11-29T09:25:55.474710',
-    message_id=u'a15b94ee-cb8e-4c71-9abe-14aa80055fb4'
+    message_id='a15b94ee-cb8e-4c71-9abe-14aa80055fb4'
 )
 
 VOLUME_TRANSFER_ACCEPT_END = models.Event(
     event_type='volume.transfer.accept.end',
-    traits=[models.Trait(u'tenant_id', 1, '945e7d09220e4308abe4b3b734bf5fce>'),
-            models.Trait(u'project_id', 1, '85bc015f7a2342348593077a927c4aaa'),
-            models.Trait(u'user_id', 1, '945e7d09220e4308abe4b3b734bf5fce'),
-            models.Trait(u'service', 1, 'volume.controller-0'),
+    traits=[models.Trait('tenant_id', 1, '945e7d09220e4308abe4b3b734bf5fce>'),
+            models.Trait('project_id', 1, '85bc015f7a2342348593077a927c4aaa'),
+            models.Trait('user_id', 1, '945e7d09220e4308abe4b3b734bf5fce'),
+            models.Trait('service', 1, 'volume.controller-0'),
             models.Trait(
-                u'request_id', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
+                'request_id', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
             models.Trait(
-                u'resource_id', 1, '156b8d3f-ad99-429b-b84c-3f263fb2a801'),
+                'resource_id', 1, '156b8d3f-ad99-429b-b84c-3f263fb2a801'),
             models.Trait(
-                u'display_name', 1, 'test-vol'),
+                'display_name', 1, 'test-vol'),
             models.Trait(
-                u'type', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
-            models.Trait(u'host', 1, 'hostgroup@tripleo_iscsi#tripleo_iscsi'),
-            models.Trait(u'created_at', 4, '2020-08-28 12:51:52'),
-            models.Trait(u'size', 2, 1)],
+                'type', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
+            models.Trait('host', 1, 'hostgroup@tripleo_iscsi#tripleo_iscsi'),
+            models.Trait('created_at', 4, '2020-08-28 12:51:52'),
+            models.Trait('size', 2, 1)],
     raw={},
     generated='2020-08-28T12:52:22.930413',
-    message_id=u'9fc4ceee-d980-4098-a685-2ad660838ac1'
+    message_id='9fc4ceee-d980-4098-a685-2ad660838ac1'
 )
 
 SNAPSHOT_TRANSFER_ACCEPT_END = models.Event(
     event_type='snapshot.transfer.accept.end',
-    traits=[models.Trait(u'tenant_id', 1, '945e7d09220e4308abe4b3b734bf5fce>'),
-            models.Trait(u'project_id', 1, '85bc015f7a2342348593077a927c4aaa'),
-            models.Trait(u'user_id', 1, '945e7d09220e4308abe4b3b734bf5fce'),
-            models.Trait(u'service', 1, 'volume.controller-0'),
+    traits=[models.Trait('tenant_id', 1, '945e7d09220e4308abe4b3b734bf5fce>'),
+            models.Trait('project_id', 1, '85bc015f7a2342348593077a927c4aaa'),
+            models.Trait('user_id', 1, '945e7d09220e4308abe4b3b734bf5fce'),
+            models.Trait('service', 1, 'volume.controller-0'),
             models.Trait(
-                u'request_id', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
+                'request_id', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
             models.Trait(
-                u'resource_id', 1, '156b8d3f-ad99-429b-b84c-3f263fb2a801'),
+                'resource_id', 1, '156b8d3f-ad99-429b-b84c-3f263fb2a801'),
             models.Trait(
-                u'display_name', 1, 'test-vol'),
+                'display_name', 1, 'test-vol'),
             models.Trait(
-                u'type', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
-            models.Trait(u'host', 1, 'hostgroup@tripleo_iscsi#tripleo_iscsi'),
-            models.Trait(u'created_at', 4, '2020-08-28 12:51:52'),
-            models.Trait(u'size', 2, 1)],
+                'type', 1, 'req-71dd1ae4-81ca-431a-b9fd-ac833eba889f'),
+            models.Trait('host', 1, 'hostgroup@tripleo_iscsi#tripleo_iscsi'),
+            models.Trait('created_at', 4, '2020-08-28 12:51:52'),
+            models.Trait('size', 2, 1)],
     raw={},
     generated='2020-08-28T12:52:22.930413',
-    message_id=u'9fc4ceee-d980-4098-a685-2ad660838ac1'
+    message_id='9fc4ceee-d980-4098-a685-2ad660838ac1'
 )
 
 
diff --git a/ceilometer/tests/unit/publisher/test_utils.py b/ceilometer/tests/unit/publisher/test_utils.py
index 2f1dfe77..6f15eb97 100644
--- a/ceilometer/tests/unit/publisher/test_utils.py
+++ b/ceilometer/tests/unit/publisher/test_utils.py
@@ -78,7 +78,7 @@ class TestSignature(base.BaseTestCase):
 
     def test_verify_signature_unicode(self):
         data = {'a': 'A', 'b': 'B',
-                'message_signature': u''}
+                'message_signature': ''}
         self.assertFalse(utils.verify_signature(data, 'not-so-secret'))
 
     def test_verify_signature_nested(self):
@@ -109,8 +109,8 @@ class TestSignature(base.BaseTestCase):
         self.assertTrue(utils.verify_signature(jsondata, 'not-so-secret'))
 
     def test_verify_unicode_symbols(self):
-        data = {u'a\xe9\u0437': 'A',
-                'b': u'B\xe9\u0437'
+        data = {'a\xe9\u0437': 'A',
+                'b': 'B\xe9\u0437'
                 }
         data['message_signature'] = utils.compute_signature(
             data,
diff --git a/ceilometer/tests/unit/test_middleware.py b/ceilometer/tests/unit/test_middleware.py
index 81017b84..3344ee06 100644
--- a/ceilometer/tests/unit/test_middleware.py
+++ b/ceilometer/tests/unit/test_middleware.py
@@ -20,48 +20,48 @@ from ceilometer.tests import base
 
 
 HTTP_REQUEST = {
-    u'ctxt': {u'auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2',
-              u'is_admin': True,
-              u'project_id': u'7c150a59fe714e6f9263774af9688f0e',
-              u'quota_class': None,
-              u'read_deleted': u'no',
-              u'remote_address': u'10.0.2.15',
-              u'request_id': u'req-d68b36e0-9233-467f-9afb-d81435d64d66',
-              u'roles': [u'admin'],
-              u'timestamp': u'2012-05-08T20:23:41.425105',
-              u'user_id': u'1e3ce043029547f1a61c1996d1a531a2'},
-    u'event_type': u'http.request',
-    u'payload': {u'request': {'HTTP_X_FOOBAR': 'foobaz',
-                              'HTTP_X_USER_ID': 'jd-x32',
-                              'HTTP_X_PROJECT_ID': 'project-id',
-                              'HTTP_X_SERVICE_NAME': 'nova'}},
-    u'priority': u'INFO',
-    u'publisher_id': u'compute.vagrant-precise',
-    u'metadata': {u'message_id': u'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
-                  u'timestamp': u'2012-05-08 20:23:48.028195'},
+    'ctxt': {'auth_token': '3d8b13de1b7d499587dfc69b77dc09c2',
+             'is_admin': True,
+             'project_id': '7c150a59fe714e6f9263774af9688f0e',
+             'quota_class': None,
+             'read_deleted': 'no',
+             'remote_address': '10.0.2.15',
+             'request_id': 'req-d68b36e0-9233-467f-9afb-d81435d64d66',
+             'roles': ['admin'],
+             'timestamp': '2012-05-08T20:23:41.425105',
+             'user_id': '1e3ce043029547f1a61c1996d1a531a2'},
+    'event_type': 'http.request',
+    'payload': {'request': {'HTTP_X_FOOBAR': 'foobaz',
+                            'HTTP_X_USER_ID': 'jd-x32',
+                            'HTTP_X_PROJECT_ID': 'project-id',
+                            'HTTP_X_SERVICE_NAME': 'nova'}},
+    'priority': 'INFO',
+    'publisher_id': 'compute.vagrant-precise',
+    'metadata': {'message_id': 'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
+                 'timestamp': '2012-05-08 20:23:48.028195'},
 }
 
 HTTP_RESPONSE = {
-    u'ctxt': {u'auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2',
-              u'is_admin': True,
-              u'project_id': u'7c150a59fe714e6f9263774af9688f0e',
-              u'quota_class': None,
-              u'read_deleted': u'no',
-              u'remote_address': u'10.0.2.15',
-              u'request_id': u'req-d68b36e0-9233-467f-9afb-d81435d64d66',
-              u'roles': [u'admin'],
-              u'timestamp': u'2012-05-08T20:23:41.425105',
-              u'user_id': u'1e3ce043029547f1a61c1996d1a531a2'},
-    u'event_type': u'http.response',
-    u'payload': {u'request': {'HTTP_X_FOOBAR': 'foobaz',
-                              'HTTP_X_USER_ID': 'jd-x32',
-                              'HTTP_X_PROJECT_ID': 'project-id',
-                              'HTTP_X_SERVICE_NAME': 'nova'},
-                 u'response': {'status': '200 OK'}},
-    u'priority': u'INFO',
-    u'publisher_id': u'compute.vagrant-precise',
-    u'metadata': {u'message_id': u'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
-                  u'timestamp': u'2012-05-08 20:23:48.028195'},
+    'ctxt': {'auth_token': '3d8b13de1b7d499587dfc69b77dc09c2',
+             'is_admin': True,
+             'project_id': '7c150a59fe714e6f9263774af9688f0e',
+             'quota_class': None,
+             'read_deleted': 'no',
+             'remote_address': '10.0.2.15',
+             'request_id': 'req-d68b36e0-9233-467f-9afb-d81435d64d66',
+             'roles': ['admin'],
+             'timestamp': '2012-05-08T20:23:41.425105',
+             'user_id': '1e3ce043029547f1a61c1996d1a531a2'},
+    'event_type': 'http.response',
+    'payload': {'request': {'HTTP_X_FOOBAR': 'foobaz',
+                            'HTTP_X_USER_ID': 'jd-x32',
+                            'HTTP_X_PROJECT_ID': 'project-id',
+                            'HTTP_X_SERVICE_NAME': 'nova'},
+                'response': {'status': '200 OK'}},
+    'priority': 'INFO',
+    'publisher_id': 'compute.vagrant-precise',
+    'metadata': {'message_id': 'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
+                 'timestamp': '2012-05-08 20:23:48.028195'},
 }
 
 
diff --git a/ceilometer/tests/unit/test_neutronclient.py b/ceilometer/tests/unit/test_neutronclient.py
index b48a249f..97c04ed4 100644
--- a/ceilometer/tests/unit/test_neutronclient.py
+++ b/ceilometer/tests/unit/test_neutronclient.py
@@ -64,6 +64,6 @@ class TestNeutronClient(base.BaseTestCase):
                   'router:external': True,
                   'shared': False,
                   'status': 'ACTIVE',
-                  'subnets': [u'c4b6f5b8-3508-4896-b238-a441f25fb492'],
+                  'subnets': ['c4b6f5b8-3508-4896-b238-a441f25fb492'],
                   'tenant_id': '62d6f08bbd3a44f6ad6f00ca15cce4e5'},
                  ]}
diff --git a/ceilometer/tests/unit/test_notification.py b/ceilometer/tests/unit/test_notification.py
index 2c6dffc1..5b5fa38b 100644
--- a/ceilometer/tests/unit/test_notification.py
+++ b/ceilometer/tests/unit/test_notification.py
@@ -27,54 +27,54 @@ from ceilometer import service
 from ceilometer.tests import base as tests_base
 
 TEST_NOTICE_CTXT = {
-    u'auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2',
-    u'is_admin': True,
-    u'project_id': u'7c150a59fe714e6f9263774af9688f0e',
-    u'quota_class': None,
-    u'read_deleted': u'no',
-    u'remote_address': u'10.0.2.15',
-    u'request_id': u'req-d68b36e0-9233-467f-9afb-d81435d64d66',
-    u'roles': [u'admin'],
-    u'timestamp': u'2012-05-08T20:23:41.425105',
-    u'user_id': u'1e3ce043029547f1a61c1996d1a531a2',
+    'auth_token': '3d8b13de1b7d499587dfc69b77dc09c2',
+    'is_admin': True,
+    'project_id': '7c150a59fe714e6f9263774af9688f0e',
+    'quota_class': None,
+    'read_deleted': 'no',
+    'remote_address': '10.0.2.15',
+    'request_id': 'req-d68b36e0-9233-467f-9afb-d81435d64d66',
+    'roles': ['admin'],
+    'timestamp': '2012-05-08T20:23:41.425105',
+    'user_id': '1e3ce043029547f1a61c1996d1a531a2',
 }
 
 TEST_NOTICE_METADATA = {
-    u'message_id': u'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
-    u'timestamp': u'2012-05-08 20:23:48.028195',
+    'message_id': 'dae6f69c-00e0-41c0-b371-41ec3b7f4451',
+    'timestamp': '2012-05-08 20:23:48.028195',
 }
 
 TEST_NOTICE_PAYLOAD = {
-    u'created_at': u'2012-05-08 20:23:41',
-    u'deleted_at': u'',
-    u'disk_gb': 0,
-    u'display_name': u'testme',
-    u'fixed_ips': [{u'address': u'10.0.0.2',
-                    u'floating_ips': [],
-                    u'meta': {},
-                    u'type': u'fixed',
-                    u'version': 4}],
-    u'image_ref_url': u'http://10.0.2.15:9292/images/UUID',
-    u'instance_id': u'9f9d01b9-4a58-4271-9e27-398b21ab20d1',
-    u'instance_type': u'm1.tiny',
-    u'instance_type_id': 2,
-    u'launched_at': u'2012-05-08 20:23:47.985999',
-    u'memory_mb': 512,
-    u'state': u'active',
-    u'state_description': u'',
-    u'tenant_id': u'7c150a59fe714e6f9263774af9688f0e',
-    u'user_id': u'1e3ce043029547f1a61c1996d1a531a2',
-    u'reservation_id': u'1e3ce043029547f1a61c1996d1a531a3',
-    u'vcpus': 1,
-    u'root_gb': 0,
-    u'ephemeral_gb': 0,
-    u'host': u'compute-host-name',
-    u'availability_zone': u'1e3ce043029547f1a61c1996d1a531a4',
-    u'os_type': u'linux?',
-    u'architecture': u'x86',
-    u'image_ref': u'UUID',
-    u'kernel_id': u'1e3ce043029547f1a61c1996d1a531a5',
-    u'ramdisk_id': u'1e3ce043029547f1a61c1996d1a531a6',
+    'created_at': '2012-05-08 20:23:41',
+    'deleted_at': '',
+    'disk_gb': 0,
+    'display_name': 'testme',
+    'fixed_ips': [{'address': '10.0.0.2',
+                    'floating_ips': [],
+                    'meta': {},
+                    'type': 'fixed',
+                    'version': 4}],
+    'image_ref_url': 'http://10.0.2.15:9292/images/UUID',
+    'instance_id': '9f9d01b9-4a58-4271-9e27-398b21ab20d1',
+    'instance_type': 'm1.tiny',
+    'instance_type_id': 2,
+    'launched_at': '2012-05-08 20:23:47.985999',
+    'memory_mb': 512,
+    'state': 'active',
+    'state_description': '',
+    'tenant_id': '7c150a59fe714e6f9263774af9688f0e',
+    'user_id': '1e3ce043029547f1a61c1996d1a531a2',
+    'reservation_id': '1e3ce043029547f1a61c1996d1a531a3',
+    'vcpus': 1,
+    'root_gb': 0,
+    'ephemeral_gb': 0,
+    'host': 'compute-host-name',
+    'availability_zone': '1e3ce043029547f1a61c1996d1a531a4',
+    'os_type': 'linux?',
+    'architecture': 'x86',
+    'image_ref': 'UUID',
+    'kernel_id': '1e3ce043029547f1a61c1996d1a531a5',
+    'ramdisk_id': '1e3ce043029547f1a61c1996d1a531a6',
 }
 
 
diff --git a/ceilometer/tests/unit/test_sample.py b/ceilometer/tests/unit/test_sample.py
index cf70358b..c947e6b3 100644
--- a/ceilometer/tests/unit/test_sample.py
+++ b/ceilometer/tests/unit/test_sample.py
@@ -39,13 +39,13 @@ class TestSample(base.BaseTestCase):
 
     def test_sample_from_notifications_list(self):
         msg = {
-            'event_type': u'sample.create',
+            'event_type': 'sample.create',
             'metadata': {
-                'timestamp': u'2015-06-19T09:19:35.786893',
-                'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'},
-            'payload': [{u'counter_name': u'instance100'}],
+                'timestamp': '2015-06-19T09:19:35.786893',
+                'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e'},
+            'payload': [{'counter_name': 'instance100'}],
             'priority': 'info',
-            'publisher_id': u'ceilometer.api',
+            'publisher_id': 'ceilometer.api',
         }
         s = sample.Sample.from_notification(
             'sample', 'type', 1.0, '%', 'user', 'project', 'res', msg)
@@ -55,13 +55,13 @@ class TestSample(base.BaseTestCase):
 
     def test_sample_from_notifications_dict(self):
         msg = {
-            'event_type': u'sample.create',
+            'event_type': 'sample.create',
             'metadata': {
-                'timestamp': u'2015-06-19T09:19:35.786893',
-                'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'},
-            'payload': {u'counter_name': u'instance100'},
+                'timestamp': '2015-06-19T09:19:35.786893',
+                'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e'},
+            'payload': {'counter_name': 'instance100'},
             'priority': 'info',
-            'publisher_id': u'ceilometer.api',
+            'publisher_id': 'ceilometer.api',
         }
         s = sample.Sample.from_notification(
             'sample', 'type', 1.0, '%', 'user', 'project', 'res', msg)
@@ -71,13 +71,13 @@ class TestSample(base.BaseTestCase):
 
     def test_sample_from_notifications_assume_utc(self):
         msg = {
-            'event_type': u'sample.create',
+            'event_type': 'sample.create',
             'metadata': {
-                'timestamp': u'2015-06-19T09:19:35.786893',
-                'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'},
-            'payload': {u'counter_name': u'instance100'},
+                'timestamp': '2015-06-19T09:19:35.786893',
+                'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e'},
+            'payload': {'counter_name': 'instance100'},
             'priority': 'info',
-            'publisher_id': u'ceilometer.api',
+            'publisher_id': 'ceilometer.api',
         }
         s = sample.Sample.from_notification(
             'sample', 'type', 1.0, '%', 'user', 'project', 'res', msg)
@@ -85,13 +85,13 @@ class TestSample(base.BaseTestCase):
 
     def test_sample_from_notifications_keep_tz(self):
         msg = {
-            'event_type': u'sample.create',
+            'event_type': 'sample.create',
             'metadata': {
-                'timestamp': u'2015-06-19T09:19:35.786893+01:00',
-                'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'},
-            'payload': {u'counter_name': u'instance100'},
+                'timestamp': '2015-06-19T09:19:35.786893+01:00',
+                'message_id': '939823de-c242-45a2-a399-083f4d6a8c3e'},
+            'payload': {'counter_name': 'instance100'},
             'priority': 'info',
-            'publisher_id': u'ceilometer.api',
+            'publisher_id': 'ceilometer.api',
         }
         s = sample.Sample.from_notification(
             'sample', 'type', 1.0, '%', 'user', 'project', 'res', msg)
diff --git a/ceilometer/tests/unit/volume/test_cinder.py b/ceilometer/tests/unit/volume/test_cinder.py
index 4473f84b..d528e1b0 100644
--- a/ceilometer/tests/unit/volume/test_cinder.py
+++ b/ceilometer/tests/unit/volume/test_cinder.py
@@ -18,38 +18,38 @@ from ceilometer.volume import cinder
 
 VOLUME_LIST = [
     type('Volume', (object,),
-         {u'migration_status': None,
-          u'attachments': [
-              {u'server_id': u'1ae69721-d071-4156-a2bd-b11bb43ec2e3',
-               u'attachment_id': u'f903d95e-f999-4a34-8be7-119eadd9bb4f',
-               u'attached_at': u'2016-07-14T03:55:57.000000',
-               u'host_name': None,
-               u'volume_id': u'd94c18fb-b680-4912-9741-da69ee83c94f',
-               u'device': u'/dev/vdb',
-               u'id': u'd94c18fb-b680-4912-9741-da69ee83c94f'}],
-          u'links': [{
-              u'href': u'http://fake_link3',
-              u'rel': u'self'},
+         {'migration_status': None,
+          'attachments': [
+              {'server_id': '1ae69721-d071-4156-a2bd-b11bb43ec2e3',
+               'attachment_id': 'f903d95e-f999-4a34-8be7-119eadd9bb4f',
+               'attached_at': '2016-07-14T03:55:57.000000',
+               'host_name': None,
+               'volume_id': 'd94c18fb-b680-4912-9741-da69ee83c94f',
+               'device': '/dev/vdb',
+               'id': 'd94c18fb-b680-4912-9741-da69ee83c94f'}],
+          'links': [{
+              'href': 'http://fake_link3',
+              'rel': 'self'},
               {
-                  u'href': u'http://fake_link4',
-                  u'rel': u'bookmark'}],
-          u'availability_zone': u'nova',
-          u'os-vol-host-attr:host': u'test@lvmdriver-1#lvmdriver-1',
-          u'encrypted': False,
-          u'updated_at': u'2016-07-14T03:55:57.000000',
-          u'replication_status': u'disabled',
-          u'snapshot_id': None,
-          u'id': u'd94c18fb-b680-4912-9741-da69ee83c94f',
-          u'size': 1,
-          u'user_id': u'be255bd31eb944578000fc762fde6dcf',
-          u'os-vol-tenant-attr:tenant_id': u'6824974c08974d4db864bbaa6bc08303',
-          u'os-vol-mig-status-attr:migstat': None,
-          u'metadata': {u'readonly': u'False', u'attached_mode': u'rw'},
-          u'status': u'in-use',
-          u'description': None,
-          u'multiattach': False,
-          u'source_volid': None,
-          u'consistencygroup_id': None,
+                  'href': 'http://fake_link4',
+                  'rel': 'bookmark'}],
+          'availability_zone': 'nova',
+          'os-vol-host-attr:host': 'test@lvmdriver-1#lvmdriver-1',
+          'encrypted': False,
+          'updated_at': '2016-07-14T03:55:57.000000',
+          'replication_status': 'disabled',
+          'snapshot_id': None,
+          'id': 'd94c18fb-b680-4912-9741-da69ee83c94f',
+          'size': 1,
+          'user_id': 'be255bd31eb944578000fc762fde6dcf',
+          'os-vol-tenant-attr:tenant_id': '6824974c08974d4db864bbaa6bc08303',
+          'os-vol-mig-status-attr:migstat': None,
+          'metadata': {'readonly': 'False', 'attached_mode': 'rw'},
+          'status': 'in-use',
+          'description': None,
+          'multiattach': False,
+          'source_volid': None,
+          'consistencygroup_id': None,
           u"volume_image_metadata": {
               u"checksum": u"17d9daa4fb8e20b0f6b7dec0d46fdddf",
               u"container_format": u"bare",
@@ -62,27 +62,27 @@ VOLUME_LIST = [
               u"min_ram": u"0",
               u"size": u"1572864000"
           },
-          u'os-vol-mig-status-attr:name_id': None,
-          u'name': None,
-          u'bootable': u'false',
-          u'created_at': u'2016-06-23T08:27:45.000000',
-          u'volume_type': u'lvmdriver-1'})
+          'os-vol-mig-status-attr:name_id': None,
+          'name': None,
+          'bootable': 'false',
+          'created_at': '2016-06-23T08:27:45.000000',
+          'volume_type': 'lvmdriver-1'})
 ]
 
 SNAPSHOT_LIST = [
     type('VolumeSnapshot', (object,),
-         {u'status': u'available',
-          u'os-extended-snapshot-attributes:progress': u'100%',
-          u'description': None,
-          u'os-extended-snapshot-attributes:project_id':
-              u'6824974c08974d4db864bbaa6bc08303',
-          u'size': 1,
-          u'user_id': u'be255bd31eb944578000fc762fde6dcf',
-          u'updated_at': u'2016-10-19T07:56:55.000000',
-          u'id': u'b1ea6783-f952-491e-a4ed-23a6a562e1cf',
-          u'volume_id': u'6f27bc42-c834-49ea-ae75-8d1073b37806',
-          u'metadata': {},
-          u'created_at': u'2016-10-19T07:56:55.000000',
+         {'status': 'available',
+          'os-extended-snapshot-attributes:progress': '100%',
+          'description': None,
+          'os-extended-snapshot-attributes:project_id':
+              '6824974c08974d4db864bbaa6bc08303',
+          'size': 1,
+          'user_id': 'be255bd31eb944578000fc762fde6dcf',
+          'updated_at': '2016-10-19T07:56:55.000000',
+          'id': 'b1ea6783-f952-491e-a4ed-23a6a562e1cf',
+          'volume_id': '6f27bc42-c834-49ea-ae75-8d1073b37806',
+          'metadata': {},
+          'created_at': '2016-10-19T07:56:55.000000',
           u"volume_image_metadata": {
               u"checksum": u"17d9daa4fb8e20b0f6b7dec0d46fdddf",
               u"container_format": u"bare",
@@ -95,34 +95,34 @@ SNAPSHOT_LIST = [
               u"min_ram": u"0",
               u"size": u"1572864000"
           },
-          u'name': None})
+          'name': None})
 ]
 
 BACKUP_LIST = [
     type('VolumeBackup', (object,),
-         {u'status': u'available',
-          u'object_count': 0,
-          u'container': None,
-          u'name': None,
-          u'links': [{
-              u'href': u'http://fake_urla',
-              u'rel': u'self'}, {
-              u'href': u'http://fake_urlb',
-              u'rel': u'bookmark'}],
-          u'availability_zone': u'nova',
-          u'created_at': u'2016-10-19T06:55:23.000000',
-          u'snapshot_id': None,
-          u'updated_at': u'2016-10-19T06:55:23.000000',
-          u'data_timestamp': u'2016-10-19T06:55:23.000000',
-          u'description': None,
-          u'has_dependent_backups': False,
-          u'volume_id': u'6f27bc42-c834-49ea-ae75-8d1073b37806',
-          u'os-backup-project-attr:project_id':
-              u'6824974c08974d4db864bbaa6bc08303',
-          u'fail_reason': u"",
-          u'is_incremental': False,
-          u'id': u'75a52125-85ff-4a8d-b2aa-580f3b22273f',
-          u'size': 1})
+         {'status': 'available',
+          'object_count': 0,
+          'container': None,
+          'name': None,
+          'links': [{
+              'href': 'http://fake_urla',
+              'rel': 'self'}, {
+              'href': 'http://fake_urlb',
+              'rel': 'bookmark'}],
+          'availability_zone': 'nova',
+          'created_at': '2016-10-19T06:55:23.000000',
+          'snapshot_id': None,
+          'updated_at': '2016-10-19T06:55:23.000000',
+          'data_timestamp': '2016-10-19T06:55:23.000000',
+          'description': None,
+          'has_dependent_backups': False,
+          'volume_id': '6f27bc42-c834-49ea-ae75-8d1073b37806',
+          'os-backup-project-attr:project_id':
+              '6824974c08974d4db864bbaa6bc08303',
+          'fail_reason': u"",
+          'is_incremental': False,
+          'id': '75a52125-85ff-4a8d-b2aa-580f3b22273f',
+          'size': 1})
 ]