From: KIYOHIRO ADACHI Date: Mon, 10 Feb 2014 09:59:38 +0000 (+0900) Subject: Remove unused methods X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=db29f6e0e239c9efccabf1aede7075f425d9c607;p=openstack-build%2Fcinder-build.git Remove unused methods o cinder/volume/driver.py - def _get_iscsi_initiator(self): This method was removed in the following commit. commit cb6faab4d99801e76195802659013a5ccdc6b5b5 Author: Walter A. Boring IV Date: Wed Jul 10 15:22:06 2013 -0700 Add Brick Fibre Channel attach/detach support. o cinder/volume/utils.py - def get_host_from_queue(queuename): This method was added in the following commit. commit 6c708d12f58eb20fce6733f1f6fd08d978570775 Author: Michael Basnight Date: Mon Feb 11 15:54:45 2013 -0600 Update cinder-volume to enable multi volume support But there is no evidence that was used. - def notify_usage_exists(context, volume_ref, current_period=False): This method was removed in the following commit. commit d09b7c78b3c905badb1112434eb9c09c2c8ffb5a Author: Ollie Leahy Date: Thu Dec 12 11:01:34 2013 +0000 Allow user to specify audit period. Change-Id: I819679e03df9a2a848004d14e3f55821c88834a4 --- diff --git a/cinder/tests/test_volume_utils.py b/cinder/tests/test_volume_utils.py index 4bb1464ea..bd05b7a34 100644 --- a/cinder/tests/test_volume_utils.py +++ b/cinder/tests/test_volume_utils.py @@ -75,50 +75,6 @@ class UsageInfoTestCase(test.TestCase): vol.update(params) return db.volume_create(self.context, vol)['id'] - def test_notify_usage_exists(self): - """Ensure 'exists' notification generates appropriate usage data.""" - volume_id = self._create_volume() - volume = db.volume_get(self.context, volume_id) - volume_utils.notify_usage_exists(self.context, volume) - LOG.info("%r" % test_notifier.NOTIFICATIONS) - self.assertEqual(len(test_notifier.NOTIFICATIONS), 1) - msg = test_notifier.NOTIFICATIONS[0] - self.assertEqual(msg['priority'], 'INFO') - self.assertEqual(msg['event_type'], 'volume.exists') - payload = msg['payload'] - self.assertEqual(payload['tenant_id'], self.project_id) - self.assertEqual(payload['user_id'], self.user_id) - self.assertEqual(payload['snapshot_id'], self.snapshot_id) - self.assertEqual(payload['volume_id'], volume.id) - self.assertEqual(payload['size'], self.volume_size) - for attr in ('display_name', 'created_at', 'launched_at', - 'status', 'audit_period_beginning', - 'audit_period_ending'): - self.assertIn(attr, payload) - db.volume_destroy(context.get_admin_context(), volume['id']) - - def test_get_host_from_queue_simple(self): - fullname = "%s.%s@%s" % (self.QUEUE_NAME, self.HOSTNAME, self.BACKEND) - self.assertEqual(volume_utils.get_host_from_queue(fullname), - self.HOSTNAME) - - def test_get_host_from_queue_ip(self): - fullname = "%s.%s@%s" % (self.QUEUE_NAME, self.HOSTIP, self.BACKEND) - self.assertEqual(volume_utils.get_host_from_queue(fullname), - self.HOSTIP) - - def test_get_host_from_queue_multi_at_symbol(self): - fullname = "%s.%s@%s" % (self.QUEUE_NAME, self.HOSTNAME, - self.MULTI_AT_BACKEND) - self.assertEqual(volume_utils.get_host_from_queue(fullname), - self.HOSTNAME) - - def test_get_host_from_queue_ip_multi_at_symbol(self): - fullname = "%s.%s@%s" % (self.QUEUE_NAME, self.HOSTIP, - self.MULTI_AT_BACKEND) - self.assertEqual(volume_utils.get_host_from_queue(fullname), - self.HOSTIP) - class LVMVolumeDriverTestCase(test.TestCase): def test_convert_blocksize_option(self): diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index 544f81bf6..d3023ccd8 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -703,15 +703,6 @@ class ISCSIDriver(VolumeDriver): def terminate_connection(self, volume, connector, **kwargs): pass - def _get_iscsi_initiator(self): - """Get iscsi initiator name for this machine.""" - # NOTE openiscsi stores initiator name in a file that - # needs root permission to read. - contents = utils.read_file_as_root('/etc/iscsi/initiatorname.iscsi') - for l in contents.split('\n'): - if l.startswith('InitiatorName='): - return l[l.index('=') + 1:].strip() - def get_volume_stats(self, refresh=False): """Get volume stats. diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py index 6429d5590..8fd765221 100644 --- a/cinder/volume/utils.py +++ b/cinder/volume/utils.py @@ -25,7 +25,6 @@ from cinder.openstack.common import log as logging from cinder.openstack.common.notifier import api as notifier_api from cinder.openstack.common import processutils from cinder.openstack.common import strutils -from cinder.openstack.common import timeutils from cinder import units from cinder import utils @@ -35,34 +34,6 @@ CONF = cfg.CONF LOG = logging.getLogger(__name__) -def get_host_from_queue(queuename): - # This assumes the queue is named something like cinder-volume - # and does not have dot separators in the queue name - return queuename.split('@', 1)[0].split('.', 1)[1] - - -def notify_usage_exists(context, volume_ref, current_period=False): - """Generates 'exists' notification for a volume for usage auditing - purposes. - - Generates usage for last completed period, unless 'current_period' - is True. - """ - begin, end = utils.last_completed_audit_period() - if current_period: - audit_start = end - audit_end = timeutils.utcnow() - else: - audit_start = begin - audit_end = end - - extra_usage_info = dict(audit_period_beginning=str(audit_start), - audit_period_ending=str(audit_end)) - - notify_about_volume_usage(context, volume_ref, - 'exists', extra_usage_info=extra_usage_info) - - def null_safe_str(s): return str(s) if s else ''