Skip to content

Fixed a couple of PEP8 errors in the python #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebrandon1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed a couple of PEP8 errors in the python #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 106 additions & 72 deletions nova-quota-sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ from sqlalchemy.orm import sessionmaker
from sqlalchemy.ext.declarative import declarative_base



def makeConnection(db_url):
engine = create_engine(db_url)
engine.connect()
Expand All @@ -59,11 +58,16 @@ def update_quota_usages(meta, usage):
cores = 0
ram = 0

for (inst_project_id, inst_user_id, inst_instances, inst_cores,
inst_ram) in resources_project_user_usage_projectid(meta,
for (
inst_project_id,
inst_user_id,
inst_instances,
inst_cores,
inst_ram) in resources_project_user_usage_projectid(
meta,
usage['project_id']):
if usage['project_id'] == inst_project_id and\
usage['user_id'] == inst_user_id:
usage['user_id'] == inst_user_id:
instances = inst_instances
cores = inst_cores
ram = inst_ram
Expand All @@ -73,7 +77,7 @@ def update_quota_usages(meta, usage):
ram_quota_usage = 0

quota_usage = resources_project_user_quota_usage(meta, usage['project_id'],
usage['user_id'])
usage['user_id'])

for (quota_resource, quota_in_use) in quota_usage:
if quota_resource == 'instances':
Expand All @@ -97,67 +101,84 @@ def update_quota_usages(meta, usage):
if usage['ram_quota_usage'] != ram_quota_usage:
changed = True

if changed == True:
print ("[skiping sync] Values changed meanwhile. project_id:%s user_id:%s" % (usage['project_id'], usage['user_id']))
if changed:
print (
"[skiping sync] Values changed meanwhile. project_id:%s user_id:%s" %
(usage['project_id'], usage['user_id']))
return

if usage['instances'] != usage['instances_quota_usage']:
update_quota_usages_db(meta, usage['project_id'], usage['user_id'],
'instances', usage['instances'])
'instances', usage['instances'])
if usage['cores'] != usage['cores_quota_usage']:
update_quota_usages_db(meta, usage['project_id'], usage['user_id'],
'cores', usage['cores'])
'cores', usage['cores'])
if usage['ram'] != usage['ram_quota_usage']:
update_quota_usages_db(meta, usage['project_id'], usage['user_id'],
'ram', usage['ram'])
'ram', usage['ram'])


def update_quota_usages_db(meta, project_id, user_id, resource, in_use):
quota_usages = Table('quota_usages', meta, autoload=True)
now = datetime.datetime.utcnow()
quota = select(columns=[quota_usages.c.user_id],
whereclause=and_(quota_usages.c.user_id == user_id,
quota_usages.c.project_id == project_id,
quota_usages.c.resource == resource)).execute().fetchone()
now = datetime.datetime.utcnow()
quota = select(
columns=[
quota_usages.c.user_id],
whereclause=and_(
quota_usages.c.user_id == user_id,
quota_usages.c.project_id == project_id,
quota_usages.c.resource == resource)).execute().fetchone()

if not quota:
quota_usages.insert().values(created_at=now, updated_at=now,
project_id=project_id, resource=resource, in_use=in_use,
reserved=0, deleted=0, user_id=user_id).execute()
quota_usages.insert().values(
created_at=now,
updated_at=now,
project_id=project_id,
resource=resource,
in_use=in_use,
reserved=0,
deleted=0,
user_id=user_id).execute()
else:
quota_usages.update().where(and_(quota_usages.c.user_id == user_id,
quota_usages.c.project_id == project_id,
quota_usages.c.resource == resource)).values(updated_at=now,
in_use=in_use).execute()
quota_usages.update().where(
and_(
quota_usages.c.user_id == user_id,
quota_usages.c.project_id == project_id,
quota_usages.c.resource == resource)).values(
updated_at=now,
in_use=in_use).execute()


def display(resources_usage, all_resources=False):
ptable = PrettyTable(["Project ID", "User ID", "Instances", "Cores",
"Ram", "Status"])
"Ram", "Status"])

for usage in resources_usage:
if not usage['in_sync']:
if usage['instances'] != usage['instances_quota_usage']:
instances = str(usage['instances_quota_usage']) + ' -> ' + str(usage['instances'])
instances = str(usage['instances_quota_usage']) + \
' -> ' + str(usage['instances'])
else:
instances = usage['instances']
if usage['cores'] != usage['cores_quota_usage']:
cores = str(usage['cores_quota_usage']) + ' -> ' + str(usage['cores'])
cores = str(usage['cores_quota_usage']) + \
' -> ' + str(usage['cores'])
else:
cores = usage['cores']
if usage['ram'] != usage['ram_quota_usage']:
ram = str(usage['ram_quota_usage']) + ' -> ' + str(usage['ram'])
ram = str(usage['ram_quota_usage']) + \
' -> ' + str(usage['ram'])
else:
ram = usage['ram']

ptable.add_row([usage['project_id'], usage['user_id'],
instances, cores, ram,
'\033[1m\033[91mMismatch\033[0m'])
instances, cores, ram,
'\033[1m\033[91mMismatch\033[0m'])

if usage['in_sync'] and all_resources:
ptable.add_row([usage['project_id'], usage['user_id'],
usage['instances'], usage['cores'], usage['ram'],
'\033[1m\033[92mOK\033[0m'])
usage['instances'], usage['cores'], usage['ram'],
'\033[1m\033[92mOK\033[0m'])

print '\n'
print ptable
Expand Down Expand Up @@ -192,7 +213,7 @@ def project_user_usage(meta, project):
ram_quota_usage = 0

quota_usage = resources_project_user_quota_usage(meta, project_id,
user_id)
user_id)

for (quota_resource, quota_in_use) in quota_usage:
if quota_resource == 'instances':
Expand All @@ -203,27 +224,28 @@ def project_user_usage(meta, project):
ram_quota_usage = quota_in_use

resources_usage.append({'user_id': user_id,
'project_id': project_id,
'instances': instances,
'cores': cores,
'ram': ram,
'instances_quota_usage': instances_quota_usage,
'cores_quota_usage': cores_quota_usage,
'ram_quota_usage': ram_quota_usage,
'in_sync': None})
'project_id': project_id,
'instances': instances,
'cores': cores,
'ram': ram,
'instances_quota_usage': instances_quota_usage,
'cores_quota_usage': cores_quota_usage,
'ram_quota_usage': ram_quota_usage,
'in_sync': None})

quotas_usage_all = resources_project_user_quota_usage_all(meta)
for (project_id, user_id) in quotas_usage_all:
if project and project != project_id:
continue
element = filter(lambda element: element['project_id'] == project_id and element['user_id'] == user_id, resources_usage)
element = filter(lambda element: element['project_id'] == project_id and element[
'user_id'] == user_id, resources_usage)
if not element:
instances_quota_usage = 0
cores_quota_usage = 0
ram_quota_usage = 0

quota_usage = resources_project_user_quota_usage(meta, project_id,
user_id)
user_id)

for (quota_resource, quota_in_use) in quota_usage:
if quota_resource == 'instances':
Expand All @@ -234,14 +256,14 @@ def project_user_usage(meta, project):
ram_quota_usage = quota_in_use

resources_usage.append({'user_id': user_id,
'project_id': project_id,
'instances': 0,
'cores': 0,
'ram': 0,
'instances_quota_usage': instances_quota_usage,
'cores_quota_usage': cores_quota_usage,
'ram_quota_usage': ram_quota_usage,
'in_sync': None})
'project_id': project_id,
'instances': 0,
'cores': 0,
'ram': 0,
'instances_quota_usage': instances_quota_usage,
'cores_quota_usage': cores_quota_usage,
'ram_quota_usage': ram_quota_usage,
'in_sync': None})
return resources_usage


Expand All @@ -250,8 +272,8 @@ def resources_project_user_usage_all(meta, project_id):

resources_usage = select(
columns=[instances.c.project_id, instances.c.user_id,
func.count(instances.c.id), func.sum(instances.c.vcpus),
func.sum(instances.c.memory_mb)],
func.count(instances.c.id), func.sum(instances.c.vcpus),
func.sum(instances.c.memory_mb)],
whereclause=instances.c.deleted == 0,
group_by=[instances.c.project_id, instances.c.user_id])

Expand All @@ -263,10 +285,10 @@ def resources_project_user_usage_projectid(meta, project_id):

resources_usage = select(
columns=[instances.c.project_id, instances.c.user_id,
func.count(instances.c.id), func.sum(instances.c.vcpus),
func.sum(instances.c.memory_mb)],
func.count(instances.c.id), func.sum(instances.c.vcpus),
func.sum(instances.c.memory_mb)],
whereclause=and_(instances.c.project_id == project_id,
instances.c.deleted == 0),
instances.c.deleted == 0),
group_by=[instances.c.project_id, instances.c.user_id])

return resources_usage.execute()
Expand All @@ -277,7 +299,7 @@ def resources_project_user_quota_usage_all(meta):

resource_quota_usage = select(
columns=[quota_usages.c.project_id, quota_usages.c.user_id],
whereclause= quota_usages.c.deleted == 0,
whereclause=quota_usages.c.deleted == 0,
group_by=[quota_usages.c.project_id, quota_usages.c.user_id])

return resource_quota_usage.execute()
Expand All @@ -289,8 +311,8 @@ def resources_project_user_quota_usage(meta, project_id, user_id):
resource_quota_usage = select(
columns=[quota_usages.c.resource, quota_usages.c.in_use],
whereclause=and_(quota_usages.c.user_id == user_id,
quota_usages.c.project_id == project_id,
quota_usages.c.deleted == 0))
quota_usages.c.project_id == project_id,
quota_usages.c.deleted == 0))

return resource_quota_usage.execute()

Expand All @@ -310,24 +332,29 @@ def sync_resources(meta, resources_chk, auto_sync):


def yn_choice():
yes = set(['yes','y', 'ye'])
no = set(['no','n'])
yes = set(['yes', 'y', 'ye'])
no = set(['no', 'n'])
abort = set(['a', 'ab', 'abo', 'abor', 'abort'])

print "Do you want to sync? [Yes/No/Abort]"
while True:
choice = raw_input().lower()
if choice in yes:
return True
return True
elif choice in no:
return False
return False
elif choice in abort:
sys.exit(1)
else:
sys.stdout.write("Do you want to sync? [Yes/No/Abort]")
sys.stdout.write("Do you want to sync? [Yes/No/Abort]")


def show_quota_resources(meta, all_resources=False, no_sync=False, auto_sync=False, project_id=None):
def show_quota_resources(
meta,
all_resources=False,
no_sync=False,
auto_sync=False,
project_id=None):
resources = project_user_usage(meta, project_id)
resources_chk = analise_project_user_usage(resources)
display(resources_chk, all_resources)
Expand All @@ -349,20 +376,22 @@ def get_db_url(config_file):
def parse_cmdline_args():
parser = argparse.ArgumentParser()
parser.add_argument("--all",
action="store_true",
help="show the state of all quota resources")
parser.add_argument("--no_sync",
action="store_true",
help="show the state of all quota resources")
parser.add_argument(
"--no_sync",
action="store_true",
help="don't perform any synchronization of the mismatch resources")
parser.add_argument("--auto_sync",
parser.add_argument(
"--auto_sync",
action="store_true",
help="automatically sync all resources (no interactive)")
parser.add_argument("--project_id",
type=str,
help="searches only project ID")
type=str,
help="searches only project ID")
parser.add_argument("--config",
default='/etc/nova/nova.conf',
help='configuration file')
default='/etc/nova/nova.conf',
help='configuration file')
return parser.parse_args()


Expand All @@ -374,7 +403,12 @@ def main():

db_url = get_db_url(args.config)
nova_session, nova_metadata, nova_Base = makeConnection(db_url)
show_quota_resources(nova_metadata, args.all, args.no_sync, args.auto_sync, args.project_id)
show_quota_resources(
nova_metadata,
args.all,
args.no_sync,
args.auto_sync,
args.project_id)


if __name__ == "__main__":
Expand Down