openstack/rally
Code Issues Proposed changes

Validator for image checking

Browse Source 
Add validator that checks image could be used by specified flavor

Change-Id: Ib0b4213c0c8e294bd479088d1897f8fe95947799
This commit is contained in:
chen-li
2014-03-14 15:46:34 +08:00
parent 04cc202ca9
commit e94dfd6840
4 changed files with 174 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rally/benchmark/scenarios/nova/servers.py
View File

@@ -20,7 +20,7 @@ import random
from rally.benchmark.scenarios.cinder import utils as cinder_utils
from rally.benchmark.scenarios.nova import utils
from rally.benchmark.scenarios import utils as scenario_utils
from rally.benchmark import validation
from rally.benchmark import validation as valid
from rally import exceptions as rally_exceptions
from rally.openstack.common.gettextutils import _ # noqa
from rally.openstack.common import log as logging
@@ -35,8 +35,7 @@ class NovaServers(utils.NovaScenario,
def __init__(self, *args, **kwargs):
super(NovaServers, self).__init__(*args, **kwargs)
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def boot_and_delete_server(self, image_id, flavor_id,
min_sleep=0, max_sleep=0, **kwargs):
"""Tests booting and then deleting an image."""
@@ -46,8 +45,7 @@ class NovaServers(utils.NovaScenario,
self.sleep_between(min_sleep, max_sleep)
self._delete_server(server)
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def boot_server_from_volume_and_delete(self, image_id, flavor_id,
volume_size,
min_sleep=0, max_sleep=0, **kwargs):
@@ -62,8 +60,7 @@ class NovaServers(utils.NovaScenario,
self.sleep_between(min_sleep, max_sleep)
self._delete_server(server)
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def boot_runcommand_delete_server(self, image_id, flavor_id,
script, interpreter, network='private',
username='ubuntu', ip_version=4,
@@ -119,8 +116,7 @@ class NovaServers(utils.NovaScenario,
stdout=out, stderr=err))
return {'data': out, 'errors': err}
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def boot_and_bounce_server(self, image_id, flavor_id, **kwargs):
"""Tests booting a server then performing stop/start or hard/soft
reboot a number of times.
@@ -139,8 +135,7 @@ class NovaServers(utils.NovaScenario,
action()
self._delete_server(server)
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def snapshot_server(self, image_id, flavor_id, **kwargs):
"""Tests Nova instance snapshotting."""
server_name = self._generate_random_name(16)
@@ -153,8 +148,7 @@ class NovaServers(utils.NovaScenario,
self._delete_server(server)
self._delete_image(image)
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def boot_server(self, image_id, flavor_id, **kwargs):
"""Test VM boot - assumed clean-up is done elsewhere."""
server_name = self._generate_random_name(16)
@@ -165,8 +159,7 @@ class NovaServers(utils.NovaScenario,
kwargs['nics'] = [{'net-id': random_nic.id}]
self._boot_server(server_name, image_id, flavor_id, **kwargs)
@validation.add_validator(validation.flavor_exists("flavor_id"))
@validation.add_validator(validation.image_exists("image_id"))
@valid.add_validator(valid.image_valid_on_flavor("flavor_id", "image_id"))
def boot_server_from_volume(self, image_id, flavor_id,
volume_size, **kwargs):
"""Test VM boot from volume - assumed clean-up is done elsewhere."""

48
rally/benchmark/validation.py
View File

@@ -82,3 +82,51 @@ def flavor_exists(param_name):
message = _("Flavor with id '%s' not found") % flavor_id
return ValidationResult(False, message)
return flavor_exists_validator
def image_valid_on_flavor(flavor_name, image_name):
"""Returns validator for image could be used for current flavor
:param flavor_name: defines which variable should be used
to get flavor id value.
:param image_name: defines which variable should be used
to get image id value.
"""
def image_valid_on_flavor_validator(**kwargs):
flavor_id = kwargs.get(flavor_name)
novaclient = kwargs["clients"].nova()
try:
flavor = novaclient.flavors.get(flavor=flavor_id)
except nova_exc.NotFound:
message = _("Flavor with id '%s' not found") % flavor_id
return ValidationResult(False, message)
image_id = kwargs.get(image_name)
glanceclient = kwargs["clients"].glance()
try:
image = glanceclient.images.get(image=image_id)
except glance_exc.HTTPNotFound:
message = _("Image with id '%s' not found") % image_id
return ValidationResult(False, message)
if flavor.ram < (image.min_ram or 0):
message = _("The memory size for flavor '%s' is too small "
"for requested image '%s'") % (flavor_id, image_id)
return ValidationResult(False, message)
if flavor.disk:
if (image.size or 0) > flavor.disk * (1024 ** 3):
message = _("The disk size for flavor '%s' is too small "
"for requested image '%s'") % (flavor_id, image_id)
return ValidationResult(False, message)
if (image.min_disk or 0) > flavor.disk:
message = _("The disk size for flavor '%s' is too small "
"for requested image '%s'") % (flavor_id, image_id)
return ValidationResult(False, message)
return ValidationResult()
return image_valid_on_flavor_validator

107
tests/benchmark/test_validation.py
View File

@@ -89,3 +89,110 @@ class ValidationUtilsTestCase(test.TestCase):
fakenclient.flavors.get.assert_called_once_with(flavor=test_flavor_id)
self.assertFalse(result.is_valid)
self.assertIsNotNone(result.msg)
@mock.patch("rally.osclients.Clients")
def test_image_valid_on_flavor(self, mock_osclients):
fakegclient = fakes.FakeGlanceClient()
image = fakes.FakeImage()
image.min_ram = 0
image.size = 0
image.min_disk = 0
fakegclient.images.get = mock.MagicMock(return_value=image)
mock_osclients.glance.return_value = fakegclient
fakenclient = fakes.FakeNovaClient()
flavor = fakes.FakeFlavor()
flavor.ram = 1
flavor.disk = 1
fakenclient.flavors.get = mock.MagicMock(return_value=flavor)
mock_osclients.nova.return_value = fakenclient
validator = validation.image_valid_on_flavor("flavor_id", "image_id")
result = validator(clients=mock_osclients,
flavor_id=flavor.id,
image_id=image.id)
fakenclient.flavors.get.assert_called_once_with(flavor=flavor.id)
fakegclient.images.get.assert_called_once_with(image=image.id)
self.assertTrue(result.is_valid)
self.assertIsNone(result.msg)
@mock.patch("rally.osclients.Clients")
def test_image_valid_on_flavor_fail(self, mock_osclients):
fakegclient = fakes.FakeGlanceClient()
image = fakes.FakeImage()
image.min_ram = 1
image.size = 1
image.min_disk = 1
fakegclient.images.get = mock.MagicMock(return_value=image)
mock_osclients.glance.return_value = fakegclient
fakenclient = fakes.FakeNovaClient()
flavor = fakes.FakeFlavor()
flavor.ram = 0
flavor.disk = 0
fakenclient.flavors.get = mock.MagicMock(return_value=flavor)
mock_osclients.nova.return_value = fakenclient
validator = validation.image_valid_on_flavor("flavor_id", "image_id")
result = validator(clients=mock_osclients,
flavor_id=flavor.id,
image_id=image.id)
fakenclient.flavors.get.assert_called_once_with(flavor=flavor.id)
fakegclient.images.get.assert_called_once_with(image=image.id)
self.assertFalse(result.is_valid)
self.assertIsNotNone(result.msg)
@mock.patch("rally.osclients.Clients")
def test_image_valid_on_flavor_image_not_exist(self, mock_osclients):
fakegclient = fakes.FakeGlanceClient()
fakegclient.images.get = mock.MagicMock()
fakegclient.images.get.side_effect = glance_exc.HTTPNotFound
mock_osclients.glance.return_value = fakegclient
fakenclient = fakes.FakeNovaClient()
flavor = fakes.FakeFlavor()
fakenclient.flavors.get = mock.MagicMock(return_value=flavor)
mock_osclients.nova.return_value = fakenclient
validator = validation.image_valid_on_flavor("flavor_id", "image_id")
test_img_id = "test_image_id"
result = validator(clients=mock_osclients,
flavor_id=flavor.id,
image_id=test_img_id)
fakenclient.flavors.get.assert_called_once_with(flavor=flavor.id)
fakegclient.images.get.assert_called_once_with(image=test_img_id)
self.assertFalse(result.is_valid)
self.assertEqual(result.msg, "Image with id 'test_image_id' not found")
@mock.patch("rally.osclients.Clients")
def test_image_valid_on_flavor_flavor_not_exist(self, mock_osclients):
fakegclient = fakes.FakeGlanceClient()
mock_osclients.glance.return_value = fakegclient
fakenclient = fakes.FakeNovaClient()
fakenclient.flavors = mock.MagicMock()
fakenclient.flavors.get.side_effect = nova_exc.NotFound(code=404)
mock_osclients.nova.return_value = fakenclient
validator = validation.image_valid_on_flavor("flavor_id", "image_id")
test_img_id = "test_image_id"
test_flavor_id = 101
result = validator(clients=mock_osclients,
flavor_id=test_flavor_id,
image_id=test_img_id)
fakenclient.flavors.get.assert_called_once_with(flavor=test_flavor_id)
self.assertFalse(result.is_valid)
self.assertEqual(result.msg, "Flavor with id '101' not found")

14
tests/fakes.py
View File

@@ -64,9 +64,13 @@ class FakeFailedServer(FakeResource):
class FakeImage(FakeResource):
def __init__(self, manager=None):
def __init__(self, manager=None, id="image-id-0",
min_ram=0, size=0, min_disk=0):
super(FakeImage, self).__init__(manager)
self.id = "image-id-0"
self.id = id
self.min_ram = min_ram
self.size = size
self.min_disk = min_disk
class FakeFailedImage(FakeResource):
@@ -93,7 +97,11 @@ class FakeNetwork(FakeResource):
class FakeFlavor(FakeResource):
pass
def __init__(self, manager=None, ram=0, disk=0):
super(FakeFlavor, self).__init__(manager)
self.ram = ram
self.disk = disk
class FakeKeypair(FakeResource):