starlingx
/
integ
Code Issues Proposed changes

Enable Syntax flake8 Error 

Flake8 currently ignores syntax errors
Change python2 style print statements to python3 compatible style
Change in print statements results in new errors discovered by flake8
Fix B006: Do not use mutable data structures for argument defaults error
Fix F821: undefined name 'hashlib' error
Enable syntax errors (E999) for more thorough testing of code

Change-Id: Id8849e4e117ddd1fd50309415466b593d13e7456
Story: 2004515
Task: 30076
Signed-off-by: Eric Barrett <eric.barrett@windriver.com>
This commit is contained in:
Eric Barrett 2019-03-19 11:13:38 -04:00
parent 8d42ceeecb
commit c408ce506e
2 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py
View File

@ -27,6 +27,7 @@ Details:
import argparse import argparse
import datetime import datetime
import hashlib
import copy import copy
import libvirt import libvirt
import logging import logging
@ -478,10 +479,12 @@ def string_to_cpulist(cpus_str=''):
return cpulist return cpulist
def list_to_range(L=[]): def list_to_range(L=None):
""" Convert a list into a string of comma separate ranges. """ Convert a list into a string of comma separate ranges.
E.g., [1,2,3,8,9,15] is converted to '1-3,8-9,15' E.g., [1,2,3,8,9,15] is converted to '1-3,8-9,15'
""" """
if L is None:
L = []
G = (list(x) for _, x in groupby(enumerate(L), lambda i_x: i_x[0] - i_x[1])) G = (list(x) for _, x in groupby(enumerate(L), lambda i_x: i_x[0] - i_x[1]))
return ",".join( return ",".join(
"-".join(map(str, (g[0][1], g[-1][1])[:len(g)])) for g in G) "-".join(map(str, (g[0][1], g[-1][1])[:len(g)])) for g in G)
@ -686,13 +689,13 @@ def print_debug_info(tenants=None, regions=None,
pp = pprint.PrettyPrinter(indent=2) pp = pprint.PrettyPrinter(indent=2)
if True in debug.values(): if True in debug.values():
print print()
logger.debug('OPTIONS:') logger.debug('OPTIONS:')
logger.debug('debug=\n%s' % (pp.pformat(debug))) logger.debug('debug=\n%s' % (pp.pformat(debug)))
logger.debug('show=\n%s' % (pp.pformat(show))) logger.debug('show=\n%s' % (pp.pformat(show)))
if debug['creds']: if debug['creds']:
print print()
logger.debug('CREDENTIALS:') logger.debug('CREDENTIALS:')
logger.debug('regions:\n%s' % (pp.pformat(regions))) logger.debug('regions:\n%s' % (pp.pformat(regions)))
logger.debug('tenants:\n%s' % (pp.pformat(tenants))) logger.debug('tenants:\n%s' % (pp.pformat(tenants)))
@ -700,53 +703,53 @@ def print_debug_info(tenants=None, regions=None,
logger.debug('endpoints:\n%s' % (pp.pformat(endpoints))) logger.debug('endpoints:\n%s' % (pp.pformat(endpoints)))
if debug['hypervisors']: if debug['hypervisors']:
print print()
logger.debug('HYPERVISORS:') logger.debug('HYPERVISORS:')
for H in hypervisors.values(): for H in hypervisors.values():
logger.debug('hypervisor:\n%s' % (pp.pformat(vars(H)))) logger.debug('hypervisor:\n%s' % (pp.pformat(vars(H))))
print print()
logger.debug('HYPERVISORS: numa cells') logger.debug('HYPERVISORS: numa cells')
logger.debug('computes_cell:\n%s' % (pp.pformat(computes_cell))) logger.debug('computes_cell:\n%s' % (pp.pformat(computes_cell)))
if debug['statistics']: if debug['statistics']:
print print()
logger.debug('STATISTICS:') logger.debug('STATISTICS:')
logger.debug('statistic:\n%s' % (pp.pformat(vars(statistics)))) logger.debug('statistic:\n%s' % (pp.pformat(vars(statistics))))
if debug['images']: if debug['images']:
print print()
logger.debug('IMAGES:') logger.debug('IMAGES:')
for I in images.values(): for I in images.values():
logger.debug('image: id=%r\n%s' % (I.id, pp.pformat(vars(I)))) logger.debug('image: id=%r\n%s' % (I.id, pp.pformat(vars(I))))
if debug['volumes']: if debug['volumes']:
print print()
logger.debug('VOLUMES:') logger.debug('VOLUMES:')
for V in volumes.values(): for V in volumes.values():
logger.debug('volume: id=%r\n%s' % (V['volume_id'], pp.pformat(V))) logger.debug('volume: id=%r\n%s' % (V['volume_id'], pp.pformat(V)))
if debug['servers']: if debug['servers']:
print print()
logger.debug('SERVERS:') logger.debug('SERVERS:')
for S in servers.values(): for S in servers.values():
logger.debug('server: id=%r\n%s' % (S.id, pp.pformat(vars(S)))) logger.debug('server: id=%r\n%s' % (S.id, pp.pformat(vars(S))))
if debug['server_groups']: if debug['server_groups']:
print print()
logger.debug('SERVER GROUPS:') logger.debug('SERVER GROUPS:')
for S in server_groups.values(): for S in server_groups.values():
logger.debug( logger.debug(
'server_group: id=%r\n%s' % (S.id, pp.pformat(vars(S)))) 'server_group: id=%r\n%s' % (S.id, pp.pformat(vars(S))))
if debug['migrations']: if debug['migrations']:
print print()
logger.debug('MIGRATIONS:') logger.debug('MIGRATIONS:')
for M in migrations.values(): for M in migrations.values():
logger.debug('MIG: id=%r\n%s' % (M.id, pp.pformat(vars(M)))) logger.debug('MIG: id=%r\n%s' % (M.id, pp.pformat(vars(M))))
if debug['flavors']: if debug['flavors']:
print print()
logger.debug('FLAVORS:') logger.debug('FLAVORS:')
for F in flavors.values(): for F in flavors.values():
logger.debug( logger.debug(
@ -754,25 +757,25 @@ def print_debug_info(tenants=None, regions=None,
% (F.id, pp.pformat(vars(F)), pp.pformat(extra_specs[F.id]))) % (F.id, pp.pformat(vars(F)), pp.pformat(extra_specs[F.id])))
if debug['aggregates']: if debug['aggregates']:
print print()
logger.debug('AGGREGATES:') logger.debug('AGGREGATES:')
for A in aggregates.values(): for A in aggregates.values():
logger.debug('aggregate: %s' % (pp.pformat(vars(A)))) logger.debug('aggregate: %s' % (pp.pformat(vars(A))))
if debug['libvirt']: if debug['libvirt']:
print print()
logger.debug('LIBVIRT:') logger.debug('LIBVIRT:')
logger.debug('domain:\n%s' % (pp.pformat(domains))) logger.debug('domain:\n%s' % (pp.pformat(domains)))
if debug['topology']: if debug['topology']:
print print()
logger.debug('TOPOLOGY:') logger.debug('TOPOLOGY:')
logger.debug('topologies:\n%s' % (pp.pformat(topologies))) logger.debug('topologies:\n%s' % (pp.pformat(topologies)))
logger.debug('topologies_idx:\n%s' % (pp.pformat(topologies_idx))) logger.debug('topologies_idx:\n%s' % (pp.pformat(topologies_idx)))
logger.debug('topologies_sib:\n%s' % (pp.pformat(topologies_sib))) logger.debug('topologies_sib:\n%s' % (pp.pformat(topologies_sib)))
if debug: if debug:
print print()
def define_debug_flags(debug): def define_debug_flags(debug):
@ -796,7 +799,7 @@ def define_debug_flags(debug):
{debug.update({e: False}) for e in opts} {debug.update({e: False}) for e in opts}
def define_options(L_opts=[], L_brief=[], L_details=[], L_other=[]): def define_options():
""" Define several groupings with lists of show options. """ """ Define several groupings with lists of show options. """
L_opts = ['brief', L_opts = ['brief',
'all', 'all',
@ -821,10 +824,19 @@ def define_options(L_opts=[], L_brief=[], L_details=[], L_other=[]):
return (L_opts, L_brief, L_details, L_other) return (L_opts, L_brief, L_details, L_other)
def define_option_flags(show, options=[], def define_option_flags(show, options=None,
L_opts=[], L_brief=[], L_details=[], L_other=[]): L_opts=None, L_brief=None, L_details=None, L_other=None):
""" Define dictionary of option flags. """ """ Define dictionary of option flags. """
if options is None:
options = []
if L_opts is None:
L_opts = []
if L_brief is None:
L_brief = []
if L_details is None:
L_details = []
if L_other is None:
L_other = []
# Set all options to False # Set all options to False
{show.update({e: False}) for e in L_opts + L_brief + L_details + L_other} {show.update({e: False}) for e in L_opts + L_brief + L_details + L_other}
@ -856,7 +868,7 @@ def print_all_tables(tenants=None,
""" """
# Print list of aggregates # Print list of aggregates
if show['aggregates']: if show['aggregates']:
print print()
print("AGGREGATES:") print("AGGREGATES:")
pt = PrettyTable( pt = PrettyTable(
['Name', ['Name',
@ -876,7 +888,7 @@ def print_all_tables(tenants=None,
# Print list of compute host hypervisors, showing per numa details # Print list of compute host hypervisors, showing per numa details
if show['computes']: if show['computes']:
print print()
print('COMPUTE HOSTS: ' print('COMPUTE HOSTS: '
'Legend: U = Used, A = Avail') 'Legend: U = Used, A = Avail')
pt = PrettyTable( pt = PrettyTable(
@ -1015,11 +1027,11 @@ def print_all_tables(tenants=None,
'-', # memory_avail_1G '-', # memory_avail_1G
'-', # agg '-', # agg
]) ])
print pt print(pt)
# Print list of compute hosts topology # Print list of compute hosts topology
if show['topology']: if show['topology']:
print print()
print('LOGICAL CPU TOPOLOGY (compute hosts):') print('LOGICAL CPU TOPOLOGY (compute hosts):')
for host_name, topology in sorted(topologies.items(), for host_name, topology in sorted(topologies.items(),
key=lambda k_v2: (natural_keys(k_v2[0]))): key=lambda k_v2: (natural_keys(k_v2[0]))):
@ -1079,11 +1091,11 @@ def print_all_tables(tenants=None,
str(s) for s in siblings[i]) or '-') for i in cpu_ids} str(s) for s in siblings[i]) or '-') for i in cpu_ids}
pt.add_row(L) pt.add_row(L)
print(pt) print(pt)
print print()
# Print list of compute hosts topology # Print list of compute hosts topology
if show['topology-long']: if show['topology-long']:
print print()
print('LOGICAL CPU TOPOLOGY (compute hosts):') print('LOGICAL CPU TOPOLOGY (compute hosts):')
for host_name, topology in sorted(topologies.items(), for host_name, topology in sorted(topologies.items(),
key=lambda k_v3: (natural_keys(k_v3[0]))): key=lambda k_v3: (natural_keys(k_v3[0]))):
@ -1135,12 +1147,12 @@ def print_all_tables(tenants=None,
'0x%x' % (1 << i) '0x%x' % (1 << i)
]) ])
print(pt) print(pt)
print print()
# Print list of servers # Print list of servers
if show['servers']: if show['servers']:
re_server_group = re.compile(r'^(\S+)\s+\((\S+)\)$') re_server_group = re.compile(r'^(\S+)\s+\((\S+)\)$')
print print()
print('SERVERS (nova view):') print('SERVERS (nova view):')
pt = PrettyTable( pt = PrettyTable(
['tenant', ['tenant',
@ -1234,11 +1246,11 @@ def print_all_tables(tenants=None,
S.topology, S.topology,
'yes' if in_libvirt else 'NO', 'yes' if in_libvirt else 'NO',
]) ])
print pt print(pt)
# Print each libvirt domain info # Print each libvirt domain info
if show['libvirt']: if show['libvirt']:
print print()
print('SERVERS (libvirt view): ' print('SERVERS (libvirt view): '
'Legend: cpulist = [pcpu[i], ...]') 'Legend: cpulist = [pcpu[i], ...]')
pt = PrettyTable( pt = PrettyTable(
@ -1275,11 +1287,11 @@ def print_all_tables(tenants=None,
list_to_range(S['cpulist']) or '-', list_to_range(S['cpulist']) or '-',
'yes' if in_nova else 'NO', 'yes' if in_nova else 'NO',
]) ])
print pt print(pt)
# Print list of in-progress migrations # Print list of in-progress migrations
if show['migrations']: if show['migrations']:
print print()
print("MIGRATIONS (in progress): Legend: S=Source, D=Destination") print("MIGRATIONS (in progress): Legend: S=Source, D=Destination")
pt = PrettyTable( pt = PrettyTable(
['ID', ['ID',
@ -1306,12 +1318,12 @@ def print_all_tables(tenants=None,
M.old_instance_type_id, M.old_instance_type_id,
M.created_at, M.created_at,
]) ])
print pt print(pt)
# Print flavors for instances currently in use # Print flavors for instances currently in use
pp = pprint.PrettyPrinter(indent=1, width=40) pp = pprint.PrettyPrinter(indent=1, width=40)
if show['flavors']: if show['flavors']:
print print()
print("FLAVORS (in use):") print("FLAVORS (in use):")
pt = PrettyTable( pt = PrettyTable(
['id', ['id',
@ -1349,7 +1361,7 @@ def print_all_tables(tenants=None,
# Print images for instances currently in use # Print images for instances currently in use
pp = pprint.PrettyPrinter(indent=1, width=40) pp = pprint.PrettyPrinter(indent=1, width=40)
if show['images']: if show['images']:
print print()
print("IMAGES (in use):") print("IMAGES (in use):")
pt = PrettyTable( pt = PrettyTable(
['id', ['id',
@ -1379,7 +1391,7 @@ def print_all_tables(tenants=None,
# Print server groups for instances currently in use (exclude members data) # Print server groups for instances currently in use (exclude members data)
if show['server_groups']: if show['server_groups']:
print print()
print("SERVER GROUPS (in use):") print("SERVER GROUPS (in use):")
pt = PrettyTable( pt = PrettyTable(
['Tenant', ['Tenant',
@ -2109,7 +2121,7 @@ def get_info_and_display(show=None):
# Print out warnings if we detect mismatches between nova and libvirt # Print out warnings if we detect mismatches between nova and libvirt
if warnings: if warnings:
print print()
print("WARNINGS (mismatch):") print("WARNINGS (mismatch):")
pt = PrettyTable(['Message']) pt = PrettyTable(['Message'])
pt.align = 'l' pt.align = 'l'

3
tox.ini
View File

@ -65,7 +65,6 @@ commands =
# E711 comparison to None should be 'if cond is None:' # E711 comparison to None should be 'if cond is None:'
# E722 do not use bare except' # E722 do not use bare except'
# E741 ambiguous variable name 'O' # E741 ambiguous variable name 'O'
# E999 SyntaxError: invalid syntax
# H series are hacking # H series are hacking
# H101: Use TODO(NAME) # H101: Use TODO(NAME)
# H102 is apache license # H102 is apache license
@ -92,7 +91,7 @@ commands =
# F401 'module' imported but unused # F401 'module' imported but unused
# F841 local variable '_alarm_state' is assigned to but never used # F841 local variable '_alarm_state' is assigned to but never used
ignore = E121,E123,E124,E125,E126,E127,E128,E201,E202,E203,E211,E221,E222,E225,E226,E231,E251,E261,E265,E266, ignore = E121,E123,E124,E125,E126,E127,E128,E201,E202,E203,E211,E221,E222,E225,E226,E231,E251,E261,E265,E266,
E302,E303,E305,E402,E501,E711,E722,E741,E999, E302,E303,E305,E402,E501,E711,E722,E741,
H101,H102,H104,H201,H238,H233,H237,H306,H401,H404,H405, H101,H102,H104,H201,H238,H233,H237,H306,H401,H404,H405,
W191,W291,W391,W503, W191,W291,W391,W503,
B001,B007,B301,B306, B001,B007,B301,B306,