Create Flavors without Optional Arguments

Code Issues Proposed changes

fixes Bug #1056910
Allows the user to create a flavor without optional arguments.
The variable, ephemeral, is not currently set to a default value.
This none type value causes exceptions in subsequent code, which
occurs when specifying only mandatory parameters.
Change-Id: Ic440136b000dc296bef3bb6f8b0856ff5e7e4e79

This commit is contained in:

Sathish Nagappan

2012年10月18日 05:00:47 -07:00

parent 2cb47fbabf

commit 62a4aa3e8f

3 changed files with 28 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-manage

View File

@@ -832,7 +832,7 @@ class InstanceTypeCommands(object):

help='rxtx_factor')

@args('--is_public', dest="is_public", metavar='<is_public>',

help='Make flavor accessible to the public')

def create(self, name, memory, vcpus, root_gb, ephemeral_gb, flavorid=None,

def create(self, name, memory, vcpus, root_gb, ephemeral_gb=0, flavorid=None,

swap=0, rxtx_factor=1, is_public=True):

"""Creates instance types / flavors"""

try:

4
nova/compute/instance_types.py

View File

@@ -35,7 +35,7 @@ LOG = logging.getLogger(__name__)

INVALID_NAME_REGEX = re.compile("[^\w\.\- ]")

def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid=None,

def create(name, memory, vcpus, root_gb, ephemeral_gb=None, flavorid=None,

swap=None, rxtx_factor=None, is_public=True):

"""Creates instance types."""

@@ -45,6 +45,8 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb, flavorid=None,

swap = 0

if rxtx_factor is None:

rxtx_factor = 1

if ephemeral_gb is None:

ephemeral_gb = 0

kwargs = {

'memory_mb': memory,

24
nova/tests/test_instance_types.py

View File

@@ -56,6 +56,30 @@ class InstanceTypeTestCase(test.TestCase):

"""return first instance type name"""

return instance_types.get_all_types().keys()[0]

def test_instance_type_create(self):

"""Ensure instance types can be created"""

name = 'Instance create test'

flavor_id = '512'

original_list = instance_types.get_all_types()

# create new type and make sure values stick

inst_type = instance_types.create(name, 256, 1, 120,

flavorid=flavor_id)

self.assertEqual(inst_type['flavorid'], flavor_id)

self.assertEqual(inst_type['name'], name)

self.assertEqual(inst_type['memory_mb'], 256)

self.assertEqual(inst_type['vcpus'], 1)

self.assertEqual(inst_type['root_gb'], 120)

self.assertEqual(inst_type['ephemeral_gb'], 0)

self.assertEqual(inst_type['swap'], 0)

self.assertEqual(inst_type['rxtx_factor'], 1)

# make sure new type shows up in list

new_list = instance_types.get_all_types()

self.assertNotEqual(len(original_list), len(new_list),

'instance type was not created')

def test_instance_type_create_then_delete(self):

"""Ensure instance types can be created"""

name = 'Small Flavor'