set project_id for cinder polling

- corresponding work merged in cinder.
commit-id: 3f7acda20fb1e9e2623c86e560c4a5ab25b475e4
- switch to cinderv3 since v2 is deprecated

Change-Id: I347a463d33e662353147546ed4b302550eb3215d

ceilometer/tests/unit/volume/test_cinder.py

@@ -94,6 +94,8 @@ BACKUP_LIST = [
           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',

ceilometer/volume/cinder.py

@@ -102,10 +102,8 @@ class VolumeBackupSize(_Base):
                 unit='GB',
                 volume=backup.size,
                 user_id=None,
-                # TODO(liusheng): the tenant attribute isn't supported now,
-                # see: https://blueprints.launchpad.net/cinder/+spec/
-                # backup-tenant-attribute-support
-                project_id=None,
+                project_id=getattr(
+                    backup, 'os-backup-project-attr:project_id', None),
                 resource_id=backup.id,
                 resource_metadata=self.extract_metadata(backup),
             )

ceilometer/volume/discovery.py

@@ -18,9 +18,9 @@ from ceilometer.agent import plugin_base
 from ceilometer import keystone_client
 
 SERVICE_OPTS = [
-    cfg.StrOpt('cinderv2',
-               default='volumev2',
-               help='Cinder V2 service type.'),
+    cfg.StrOpt('cinder', deprecated_name='cinderv2',
+               default='volumev3',
+               help='Cinder service type.'),
 ]
 
 
@@ -29,11 +29,11 @@ class _BaseDiscovery(plugin_base.DiscoveryBase):
         super(_BaseDiscovery, self).__init__(conf)
         creds = conf.service_credentials
         self.client = cinder_client.Client(
-            version='2',
+            version='3',
             session=keystone_client.get_session(conf),
             region_name=creds.region_name,
             interface=creds.interface,
-            service_type=conf.service_types.cinderv2
+            service_type=conf.service_types.cinder
         )