From 16cbba0838e9a2ac712b91b103dc794b0edebd00 Mon Sep 17 00:00:00 2001 From: "vladimir.p" Date: Thu, 28 Jul 2011 00:45:16 -0700 Subject: more commented code removed --- nova/api/openstack/contrib/virtual_storage_arrays.py | 2 -- nova/scheduler/vsa.py | 2 -- nova/volume/manager.py | 3 --- 3 files changed, 7 deletions(-) diff --git a/nova/api/openstack/contrib/virtual_storage_arrays.py b/nova/api/openstack/contrib/virtual_storage_arrays.py index 68a00fd7d..842573f8a 100644 --- a/nova/api/openstack/contrib/virtual_storage_arrays.py +++ b/nova/api/openstack/contrib/virtual_storage_arrays.py @@ -180,8 +180,6 @@ class VsaVolumeDriveController(volumes.VolumeController): ]}}} def __init__(self): - # self.compute_api = compute.API() - # self.vsa_api = vsa.API() self.volume_api = volume.API() super(VsaVolumeDriveController, self).__init__() diff --git a/nova/scheduler/vsa.py b/nova/scheduler/vsa.py index ed5039f4d..10c9b5a02 100644 --- a/nova/scheduler/vsa.py +++ b/nova/scheduler/vsa.py @@ -324,8 +324,6 @@ class VsaScheduler(simple.SimpleScheduler): db.vsa_update(context, volume_ref['to_vsa_id'], dict(status=VsaState.FAILED)) raise - #return super(VsaScheduler, self).schedule_create_volume(context, - # volume_id, *_args, **_kwargs) if host: now = utils.utcnow() diff --git a/nova/volume/manager.py b/nova/volume/manager.py index e46f8536d..fd1d5acfa 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -265,9 +265,6 @@ class VolumeManager(manager.SchedulerDependentManager): return error_list def _volume_stats_changed(self, stat1, stat2): - #LOG.info(_("stat1=%s"), stat1) - #LOG.info(_("stat2=%s"), stat2) - if len(stat1) != len(stat2): return True for (k, v) in stat1.iteritems(): -- cgit