x/gantt
Code Issues Proposed changes

Merge "Removes constraints from instance and volume types"

Browse Source
This commit is contained in:
Jenkins
2012-02-10 22:10:54 +00:00
committed by Gerrit Code Review
parent 8de9bf89ef 61620b588b
commit cb4ebd7ae0
6 changed files with 47 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
bin/nova-manage
View File

@@ -1415,7 +1415,7 @@ class VsaCommands(object):
not self.manager.is_project_member(user_id, project_id):
msg = _("%(user_id)s must be an admin or a "
"member of %(project_id)s")
LOG.warn(msg % locals())
logging.warn(msg % locals())
raise ValueError(msg % locals())
# Sanity check for storage string
@@ -1590,22 +1590,23 @@ class VsaDriveTypeCommands(object):
if capabilities is not None and capabilities != '':
extra_specs['capabilities'] = capabilities
volume_types.create(self.context, name, extra_specs)
result = volume_types.get_volume_type_by_name(self.context, name)
self._list({name: result})
try:
volume_types.create(self.context, name, extra_specs)
result = volume_types.get_volume_type_by_name(self.context, name)
self._list({name: result})
except exception.VolumeTypeExists:
print
print "Volume Type Exists"
print "Please ensure volume_type name is unique."
print "Currently defined volume types:"
print
self.list()
@args('--name', dest='name', metavar="<name>", help='Drive name')
@args('--purge', action="store_true", dest='purge', default=False,
help='purge record from database')
def delete(self, name, purge):
"""Marks instance types / flavors as deleted"""
def delete(self, name):
"""Marks volume types as deleted"""
try:
if purge:
volume_types.purge(self.context, name)
verb = "purged"
else:
volume_types.destroy(self.context, name)
verb = "deleted"
volume_types.destroy(self.context, name)
except exception.ApiError:
print "Valid volume type name is required"
sys.exit(1)
@@ -1615,7 +1616,7 @@ class VsaDriveTypeCommands(object):
except Exception:
sys.exit(3)
else:
print "%s %s" % (name, verb)
print "%s deleted" % name
@args('--all', dest='all', action="store_true", default=False,
help='Show all drives (including invisible)')
@@ -1766,14 +1767,12 @@ class InstanceTypeCommands(object):
print "Must supply valid parameters to create instance_type"
print e
sys.exit(1)
except exception.ApiError, e:
print "\n\n"
print "\n%s" % e
except exception.InstanceTypeExists:
print "Instance Type exists."
print "Please ensure instance_type name and flavorid are unique."
print "To complete remove a instance_type, use the --purge flag:"
print "\n # nova-manage instance_type delete <name> --purge\n"
print "Currently defined instance_type names and flavorids:"
self.list("--all")
print
self.list()
sys.exit(2)
except Exception:
print "Unknown error"
@@ -1783,17 +1782,10 @@ class InstanceTypeCommands(object):
@args('--name', dest='name', metavar='<name>',
help='Name of instance type/flavor')
@args('--purge', action="store_true", dest='purge', default=False,
help='purge record from database')
def delete(self, name, purge):
def delete(self, name):
"""Marks instance types / flavors as deleted"""
try:
if purge:
instance_types.purge(name)
verb = "purged"
else:
instance_types.destroy(name)
verb = "deleted"
instance_types.destroy(name)
except exception.ApiError:
print "Valid instance type name is required"
sys.exit(1)
@@ -1803,7 +1795,7 @@ class InstanceTypeCommands(object):
except Exception:
sys.exit(3)
else:
print "%s %s" % (name, verb)
print "%s deleted" % name
@args('--name', dest='name', metavar='<name>',
help='Name of instance type/flavor')
@@ -1812,8 +1804,6 @@ class InstanceTypeCommands(object):
try:
if name is None:
inst_types = instance_types.get_all_types()
elif name == "--all":
inst_types = instance_types.get_all_types(True)
else:
inst_types = instance_types.get_instance_type_by_name(name)
except exception.DBError, e:

8
nova/exception.py
View File

@@ -847,6 +847,14 @@ class InstanceExists(Duplicate):
message = _("Instance %(name)s already exists.")
class InstanceTypeExists(Duplicate):
message = _("Instance Type %(name)s already exists.")
class VolumeTypeExists(Duplicate):
message = _("Volume Type %(name)s already exists.")
class InvalidSharedStorage(NovaException):
message = _("%(path)s is on shared storage: %(reason)s")

4
nova/tests/scheduler/test_vsa_scheduler.py
View File

@@ -74,7 +74,7 @@ class VsaSchedulerTestCase(test_scheduler.SchedulerTestCase):
def tearDown(self):
for name in self.created_types_lst:
volume_types.purge(self.context.elevated(), name)
volume_types.destroy(self.context.elevated(), name)
super(VsaSchedulerTestCase, self).tearDown()
def _get_vol_creation_request(self, num_vols, drive_ix, size=0):
@@ -89,7 +89,7 @@ class VsaSchedulerTestCase(test_scheduler.SchedulerTestCase):
'drive_type': 'type_' + str(drive_ix),
'drive_size': 1 + 100 * (drive_ix)})
self.created_types_lst.append(name)
except exception.ApiError:
except exception.VolumeTypeExists:
# type is already created
pass

28
nova/tests/test_instance_types.py
View File

@@ -84,21 +84,14 @@ class InstanceTypeTestCase(test.TestCase):
self.assertNotEqual(len(original_list), len(new_list),
'instance type was not created')
# destroy instance and make sure deleted flag is set to True
instance_types.destroy(name)
inst_type = instance_types.get_instance_type(inst_type_id)
self.assertEqual(1, inst_type["deleted"])
self.assertRaises(exception.ApiError,
instance_types.get_instance_type, inst_type_id)
# deleted instance should not be in list anymoer
new_list = instance_types.get_all_types()
self.assertEqual(original_list, new_list)
# ensure instances are gone after purge
instance_types.purge(name)
new_list = instance_types.get_all_types()
self.assertEqual(original_list, new_list,
'instance type not purged')
def test_get_all_instance_types(self):
"""Ensures that all instance types can be retrieved"""
session = get_session()
@@ -143,15 +136,15 @@ class InstanceTypeTestCase(test.TestCase):
"""Ensures that name duplicates raise ApiError"""
name = 'some_name'
instance_types.create(name, 256, 1, 120, 200, 'flavor1')
self.assertRaises(exception.ApiError,
self.assertRaises(exception.InstanceTypeExists,
instance_types.create,
name, "256", 1, 120, 200, 'flavor2')
name, 256, 1, 120, 200, 'flavor2')
def test_duplicate_flavorids_fail(self):
"""Ensures that flavorid duplicates raise ApiError"""
flavorid = 'flavor1'
instance_types.create('name one', 256, 1, 120, 200, flavorid)
self.assertRaises(exception.ApiError,
self.assertRaises(exception.InstanceTypeExists,
instance_types.create,
'name two', 256, 1, 120, 200, flavorid)
@@ -160,17 +153,6 @@ class InstanceTypeTestCase(test.TestCase):
self.assertRaises(exception.InstanceTypeNotFoundByName,
instance_types.destroy, None)
def test_will_not_purge_without_name(self):
"""Ensure purge without a name raises error"""
self.assertRaises(exception.InstanceTypeNotFoundByName,
instance_types.purge, None)
def test_will_not_purge_with_wrong_name(self):
"""Ensure purge without correct name raises error"""
self.assertRaises(exception.InstanceTypeNotFound,
instance_types.purge,
'unknown_flavor')
def test_will_not_get_bad_default_instance_type(self):
"""ensures error raised on bad default instance type"""
self.flags(default_instance_type='unknown_flavor')

43
nova/tests/test_volume_types.py
View File

@@ -75,37 +75,6 @@ class VolumeTypeTestCase(test.TestCase):
new_all_vtypes,
'drive type was not deleted')
def test_volume_type_create_then_purge(self):
"""Ensure volume types can be created and deleted"""
prev_all_vtypes = volume_types.get_all_types(self.ctxt, inactive=1)
volume_types.create(self.ctxt,
self.vol_type1_name,
self.vol_type1_specs)
new = volume_types.get_volume_type_by_name(self.ctxt,
self.vol_type1_name)
for k, v in self.vol_type1_specs.iteritems():
self.assertEqual(v, new['extra_specs'][k],
'one of fields doesnt match')
new_all_vtypes = volume_types.get_all_types(self.ctxt, inactive=1)
self.assertEqual(len(prev_all_vtypes) + 1,
len(new_all_vtypes),
'drive type was not created')
volume_types.destroy(self.ctxt, self.vol_type1_name)
new_all_vtypes2 = volume_types.get_all_types(self.ctxt, inactive=1)
self.assertEqual(len(new_all_vtypes),
len(new_all_vtypes2),
'drive type was incorrectly deleted')
volume_types.purge(self.ctxt, self.vol_type1_name)
new_all_vtypes2 = volume_types.get_all_types(self.ctxt, inactive=1)
self.assertEqual(len(new_all_vtypes) - 1,
len(new_all_vtypes2),
'drive type was not purged')
def test_get_all_volume_types(self):
"""Ensures that all volume types can be retrieved"""
session = get_session()
@@ -114,26 +83,22 @@ class VolumeTypeTestCase(test.TestCase):
vol_types = volume_types.get_all_types(self.ctxt)
self.assertEqual(total_volume_types, len(vol_types))
def test_non_existant_inst_type_shouldnt_delete(self):
def test_non_existant_vol_type_shouldnt_delete(self):
"""Ensures that volume type creation fails with invalid args"""
self.assertRaises(exception.ApiError,
volume_types.destroy, self.ctxt, "sfsfsdfdfs")
def test_repeated_vol_types_should_raise_api_error(self):
"""Ensures that volume duplicates raises ApiError"""
def test_repeated_vol_types_shouldnt_raise(self):
"""Ensures that volume duplicates don't raise"""
new_name = self.vol_type1_name + "dup"
volume_types.create(self.ctxt, new_name)
volume_types.destroy(self.ctxt, new_name)
self.assertRaises(
exception.ApiError,
volume_types.create, self.ctxt, new_name)
volume_types.create(self.ctxt, new_name)
def test_invalid_volume_types_params(self):
"""Ensures that volume type creation fails with invalid args"""
self.assertRaises(exception.InvalidVolumeType,
volume_types.destroy, self.ctxt, None)
self.assertRaises(exception.InvalidVolumeType,
volume_types.purge, self.ctxt, None)
self.assertRaises(exception.InvalidVolumeType,
volume_types.get_volume_type, self.ctxt, None)
self.assertRaises(exception.InvalidVolumeType,

10
nova/tests/test_volume_types_extra_specs.py
View File

@@ -43,11 +43,11 @@ class VolumeTypeExtraSpecsTestCase(test.TestCase):
self.vol_type2_id = ref.id
def tearDown(self):
# Remove the instance type from the database
db.volume_type_purge(context.get_admin_context(),
self.vol_type1['name'])
db.volume_type_purge(context.get_admin_context(),
self.vol_type2_noextra['name'])
# Remove the volume type from the database
db.volume_type_destroy(context.get_admin_context(),
self.vol_type1['name'])
db.volume_type_destroy(context.get_admin_context(),
self.vol_type2_noextra['name'])
super(VolumeTypeExtraSpecsTestCase, self).tearDown()
def test_volume_type_specs_get(self):