From e9b015c7e14843784debc0d68cfe070c9778f80d Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Sat, 17 Nov 2012 18:18:48 -0800 Subject: [PATCH] Cleans up the flavor creation code. Fixes bug 1080891. Change-Id: Idc76cd01d1537ab87723a05ab8dd81015284e3c8 --- novaclient/v1_1/flavors.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/novaclient/v1_1/flavors.py b/novaclient/v1_1/flavors.py index 48e826557..fa9a0de47 100644 --- a/novaclient/v1_1/flavors.py +++ b/novaclient/v1_1/flavors.py @@ -104,7 +104,7 @@ def delete(self, flavor): """ self._delete("/flavors/%s" % base.getid(flavor)) - def create(self, name, ram, vcpus, disk, flavorid, + def create(self, name, ram, vcpus, disk, flavorid=None, ephemeral=0, swap=0, rxtx_factor=1, is_public=True): """ Create (allocate) a floating ip for a tenant @@ -113,7 +113,9 @@ def create(self, name, ram, vcpus, disk, flavorid, :param ram: Memory in MB for the flavor :param vcpu: Number of VCPUs for the flavor :param disk: Size of local disk in GB - :param flavorid: Integer ID for the flavor + :param flavorid: ID for the flavor (optional). You can use the reserved + value ``"auto"`` to have Nova generate a UUID for the + flavor in cases where you cannot simply pass ``None``. :param swap: Swap space in MB :param rxtx_factor: RX/TX factor :rtype: :class:`Flavor` @@ -143,9 +145,9 @@ def create(self, name, ram, vcpus, disk, flavorid, raise exceptions.CommandError("Swap must be an integer.") try: - ephemerel = int(ephemeral) + ephemeral = int(ephemeral) except: - raise exceptions.CommandError("Ephemerel must be an integer.") + raise exceptions.CommandError("Ephemeral must be an integer.") try: rxtx_factor = int(rxtx_factor)