From e5a786098364866ffb37c29f59de43b0847de9fc Mon Sep 17 00:00:00 2001 From: stewie925 Date: Wed, 20 Mar 2019 21:24:57 -0700 Subject: [PATCH] Update Flavor name formatting Change-Id: Ibfec4f2088082d695df39d1a0a3a42a3168bc771 --- orm/services/flavor_manager/fms_rest/logic/flavor_logic.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/orm/services/flavor_manager/fms_rest/logic/flavor_logic.py b/orm/services/flavor_manager/fms_rest/logic/flavor_logic.py index fafd58ad..673a2402 100755 --- a/orm/services/flavor_manager/fms_rest/logic/flavor_logic.py +++ b/orm/services/flavor_manager/fms_rest/logic/flavor_logic.py @@ -928,6 +928,7 @@ def calculate_name(flavor): and 'n0' - flavor options are OPTIONAL """ + option_order = ['n0', 'i2', 't0'] name = "{0}.c{1}r{2}d{3}".format(flavor.flavor.series, flavor.flavor.vcpus, int(flavor.flavor.ram) / 1024, flavor.flavor.disk) @@ -959,8 +960,9 @@ def calculate_name(flavor): if options: name += '.' - for key in sorted(options): - name += key + for item in option_order: + if item in options: + name += item return name