some minor cosmetic work. addressed some dead code section

This commit is contained in:
vladimir.p
2011-07-28 00:27:16 -07:00
parent 567b9aa2d6
commit 9642fdc9fe
3 changed files with 5 additions and 14 deletions

View File

@@ -18,7 +18,6 @@
# under the License.
"""Starter script for Nova VSA."""
import gettext
import os
import sys
@@ -30,8 +29,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags
from nova import log as logging
from nova import service

View File

@@ -365,8 +365,6 @@ DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager',
'Manager for volume')
DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager',
'Manager for scheduler')
DEFINE_string('vsa_manager', 'nova.vsa.manager.VsaManager',
'Manager for vsa')
DEFINE_string('vc_image_name', 'vc_image',
'the VC image ID (for a VC image that exists in DB Glance)')
# VSA constants and enums

View File

@@ -34,8 +34,6 @@ from nova import log as logging
LOG = logging.getLogger('nova.scheduler.vsa')
FLAGS = flags.FLAGS
flags.DEFINE_integer('gb_to_bytes_shift', 30,
'Conversion shift between GB and bytes')
flags.DEFINE_integer('drive_type_approx_capacity_percent', 10,
'The percentage range for capacity comparison')
flags.DEFINE_integer('vsa_unique_hosts_per_alloc', 10,
@@ -45,11 +43,11 @@ flags.DEFINE_boolean('vsa_select_unique_drives', True,
def BYTES_TO_GB(bytes):
return bytes >> FLAGS.gb_to_bytes_shift
return bytes >> 30
def GB_TO_BYTES(gb):
return gb << FLAGS.gb_to_bytes_shift
return gb << 30
class VsaScheduler(simple.SimpleScheduler):
@@ -68,8 +66,7 @@ class VsaScheduler(simple.SimpleScheduler):
def _qosgrp_match(self, drive_type, qos_values):
def _compare_names(str1, str2):
result = str1.lower() == str2.lower()
return result
return str1.lower() == str2.lower()
def _compare_sizes_approxim(cap_capacity, size_gb):
cap_capacity = BYTES_TO_GB(int(cap_capacity))
@@ -77,9 +74,8 @@ class VsaScheduler(simple.SimpleScheduler):
size_perc = size_gb * \
FLAGS.drive_type_approx_capacity_percent / 100
result = cap_capacity >= size_gb - size_perc and \
cap_capacity <= size_gb + size_perc
return result
return cap_capacity >= size_gb - size_perc and \
cap_capacity <= size_gb + size_perc
# Add more entries for additional comparisons
compare_list = [{'cap1': 'DriveType',