diff --git a/Tests/iaas/flavor-naming/flavor-form.py b/Tests/iaas/flavor-naming/flavor-form.py index ce1a3ae7c..66fc20429 100755 --- a/Tests/iaas/flavor-naming/flavor-form.py +++ b/Tests/iaas/flavor-naming/flavor-form.py @@ -48,15 +48,15 @@ def output_parse(): print(f'\t ') print('\t ') # print(' \n') - print('\t') + print('\t
') if FLAVOR_NAME: - print(f"\t
Flavor {html.escape(FLAVOR_NAME, quote=True)}:") + print(f"\t
Flavor {html.escape(FLAVOR_NAME, quote=True)}:") if FLAVOR_SPEC: - print(f"\t{html.escape(fnmd.prettyname(FLAVOR_SPEC), quote=True)}") + print(f"\t{html.escape(fnmd.prettyname(FLAVOR_SPEC), quote=True)}") else: - print("\tNot an SCS flavor") + print("\tNot an SCS flavor") if ERROR: - print(f"\t
{html.escape(ERROR, quote=True)})") + print(f"\t
{html.escape(ERROR, quote=True)}") def find_spec(lst, key): @@ -169,9 +169,8 @@ def form_attr(attr): print(f'\tERROR: {html.escape(ERROR, quote=True)}
') print(f'\t
{spec.type}
') print('\t
') - for i in range(0, len(spec.pnames)): + for i, fname in enumerate(spec.pattrs): tbl = None - fname = spec.pattrs[i] fdesc = spec.pnames[i] if fdesc[0] != "?" or i == 0 or spec.pnames[i-1][0] != "?": print(f'\t
') @@ -181,7 +180,6 @@ def form_attr(attr): value = getattr(attr, fname) except AttributeError: pass - # FIXME: Handle leading . qualifier # Table => READIO if hasattr(attr, f"tbl_{fname}"): tbl = getattr(attr, f"tbl_{fname}") @@ -207,7 +205,7 @@ def form_attr(attr): elif fdesc[0:2] == "##": # Float number => NUMBER print(f'\t
') - print(f'\t ') + print(f'\t ') elif fdesc[0] == "#": # Float number => NUMBER # Handle : and . @@ -218,17 +216,16 @@ def form_attr(attr): elif fdesc[1] == '.': fdesc = fdesc[1:] print(f'\t
') - print(f'\t ') + print(f'\t ') elif fdesc[0] == "?": # Bool => Checkbox print(f'\t ') print(f'\t ') else: - # FIXME: Handle dependent tables if fdesc[0] == '.': fdesc = fdesc[1:] print(f'\t
') - print(f'\t ') + print(f'\t ') if fdesc[0] != "?" or i == len(spec.pnames)-1 or spec.pnames[i+1][0] != "?": print('\t
') else: @@ -264,11 +261,11 @@ def output_generate(): print('\t
') print('\t') if FLAVOR_NAME: - print(f"\t
SCS flavor name: {html.escape(FLAVOR_NAME, quote=True)}") + print(f"\t
SCS flavor name: {html.escape(FLAVOR_NAME, quote=True)}") altname = fnmck.outname(cpu, disk, None, None, None, gpu, ibd) - print(f"\t
Short SCS flavor name: {html.escape(altname, quote=True)}") + print(f"\t
Short SCS flavor name: {html.escape(altname, quote=True)}
") else: - print(f'\tERROR: {html.escape(ERROR, quote=True)}') + print(f'\tERROR: {html.escape(ERROR, quote=True)}') def main(argv):