Skip to content
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

Jump to bottom

Updates (Sourcery refactored) #529

Closed
wants to merge 1 commit into from
Closed

Updates (Sourcery refactored) #529

Show file tree
Hide file tree
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
133 changes: 54 additions & 79 deletions services/pulse2/database/updates/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,7 @@ def getDbConnection(self):
def tests(self, session):
# Tests c'est la table dans schema.py dans le module updates
ret = session.query(Tests).all()
lines = []
for row in ret:
lines.append(row.toDict())

return lines
return [row.toDict() for row in ret]
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.tests refactored with the following changes:



@DatabaseHelper._sessionm
Expand All @@ -98,17 +94,14 @@ def test_xmppmaster(self, session):
update_data.title
FROM xmppmaster.update_data
WHERE revisionid = '32268448';"""

result = session.execute(sql)
session.commit()
session.flush()
resultat = [x for x in result]

resultat = list(result)
print(resultat)
if len(resultat) == 0:
return -1
else:
return [x for x in result]
return -1 if not resultat else list(result)
Comment on lines -101 to +104
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.test_xmppmaster refactored with the following changes:

# return resultat[0][1]


Expand All @@ -124,12 +117,6 @@ def get_black_list(self, session, start, limit, filter=""):
limit= -1

try:
black_list = { 'nb_element_total': 0,
'id' : [],
'updateid_or_kb' : [],
'title': [],
"severity" : []}

Comment on lines -127 to -132
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_black_list refactored with the following changes:

sql="""SELECT SQL_CALC_FOUND_ROWS
xmppmaster.up_black_list.updateid_or_kb,
xmppmaster.update_data.title,
Expand All @@ -144,10 +131,7 @@ def get_black_list(self, session, start, limit, filter=""):
OR
up_black_list.updateid_or_kb = update_data.updateid """

filterlimit=""
if limit != -1 and start != -1:
filterlimit= "LIMIT %s, %s"%(start, limit)

filterlimit = f"LIMIT {start}, {limit}" if limit != -1 and start != -1 else ""
if filter:
ffilterwhere="""WHERE
(update_data.title LIKE '%%%s%%' OR
Expand All @@ -167,8 +151,13 @@ def get_black_list(self, session, start, limit, filter=""):
ret_count = session.execute(sql_count)
nb_element_total = ret_count.first()[0]

black_list['nb_element_total'] = nb_element_total

black_list = {
'id': [],
'updateid_or_kb': [],
'title': [],
"severity": [],
'nb_element_total': nb_element_total,
}
session.commit()
session.flush()

Expand All @@ -180,7 +169,7 @@ def get_black_list(self, session, start, limit, filter=""):
black_list['severity'].append(list_b.msrcseverity)

except Exception as e:
logger.error("error function get_black_list : %s"%e)
logger.error(f"error function get_black_list : {e}")
return black_list


Expand All @@ -196,23 +185,14 @@ def get_grey_list(self, session, start, limit, filter=""):
limit = -1

try:
grey_list={ 'nb_element_total': 0,
'updateid' : [],
'title' : [],
'kb' : [],
'valided' : [],
'severity': []}

Comment on lines -199 to -205
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_grey_list refactored with the following changes:

sql="""SELECT SQL_CALC_FOUND_ROWS
xmppmaster.up_gray_list.*,
coalesce(NULLIF(xmppmaster.update_data.msrcseverity, ""), "Corrective") as msrcseverity
FROM
xmppmaster.up_gray_list
JOIN xmppmaster.update_data on xmppmaster.update_data.updateid = xmppmaster.up_gray_list.updateid """

filterlimit= ""
if start != -1 and limit != -1:
filterlimit= "LIMIT %s, %s"%(start, limit)
filterlimit = f"LIMIT {start}, {limit}" if start != -1 and limit != -1 else ""
if filter != "":
filterwhere="""WHERE
(update_data.title LIKE '%%%s%%' OR
Expand All @@ -232,8 +212,14 @@ def get_grey_list(self, session, start, limit, filter=""):
ret_count = session.execute(sql_count)
nb_element_total = ret_count.first()[0]

grey_list['nb_element_total'] = nb_element_total

grey_list = {
'updateid': [],
'title': [],
'kb': [],
'valided': [],
'severity': [],
'nb_element_total': nb_element_total,
}
session.commit()
session.flush()

Expand Down Expand Up @@ -262,12 +248,6 @@ def get_white_list(self, session, start=0, limit=-1, filter=""):
limit = -1

try:
white_list={ 'nb_element_total': 0,
'updateid' : [],
'title' : [],
'kb' : [],
"severity": []}

Comment on lines -265 to -270
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_white_list refactored with the following changes:

sql="""SELECT SQL_CALC_FOUND_ROWS
xmppmaster.up_white_list.*,
coalesce(NULLIF(xmppmaster.update_data.msrcseverity, ""), "Corrective") as msrcseverity
Expand All @@ -284,9 +264,7 @@ def get_white_list(self, session, start=0, limit=-1, filter=""):
sql +=filterwhere

sql += " ORDER BY FIELD(msrcseverity, \"Critical\", \"Important\", \"\") "
filterlimit= ""
if start != -1 and limit != -1:
filterlimit= "LIMIT %s, %s"%(start, limit)
filterlimit = f"LIMIT {start}, {limit}" if start != -1 and limit != -1 else ""
sql += filterlimit
sql+=";"
result = session.execute(sql)
Expand All @@ -295,8 +273,13 @@ def get_white_list(self, session, start=0, limit=-1, filter=""):
ret_count = session.execute(sql_count)
nb_element_total = ret_count.first()[0]

white_list['nb_element_total'] = nb_element_total

white_list = {
'updateid': [],
'title': [],
'kb': [],
"severity": [],
'nb_element_total': nb_element_total,
}
if result:
for list_w in result:
white_list['updateid'].append(list_w.updateid)
Expand All @@ -323,14 +306,8 @@ def get_enabled_updates_list(self, session, entity, upd_list="gray", start=0, li
limit = -1

try:
list_name = "up_%s_list"%upd_list

enabled_updates_list={ 'nb_element_total': 0,
'updateid' : [],
'title' : [],
'kb' : [],
'valided' : [],
'missing' : []}
Comment on lines -326 to -333
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_enabled_updates_list refactored with the following changes:

list_name = f"up_{upd_list}_list"

sql="""SELECT SQL_CALC_FOUND_ROWS
umw.update_id AS updateid,
ud.kb AS kb,
Expand All @@ -357,19 +334,19 @@ def get_enabled_updates_list(self, session, entity, upd_list="gray", start=0, li
"""%(list_name, entity.replace("UUID", ""))

if filter != "":
filterwhere="""AND
filterwhere = """AND
(ud.title LIKE '%%%s%%'
OR ud.updateid LIKE '%%%s%%'
OR ud.kb LIKE '%%%s%%'
OR ud.description LIKE '%%%s%%'
OR ud.creationdate LIKE '%%%s%%'
OR ud.title_short LIKE '%%%s%%')"""%tuple(filter for x in range(0,6))
OR ud.title_short LIKE '%%%s%%')""" % tuple(
filter for _ in range(0, 6)
)
sql += filterwhere

sql += "group by umw.update_id "
filterlimit= ""
if start != -1 and limit != -1:
filterlimit= "LIMIT %s, %s"%(start, limit)
filterlimit = f"LIMIT {start}, {limit}" if start != -1 and limit != -1 else ""
sql += filterlimit
sql+=";"

Expand All @@ -382,8 +359,14 @@ def get_enabled_updates_list(self, session, entity, upd_list="gray", start=0, li
logging.getLogger().error(e)
nb_element_total = ret_count.first()[0]

enabled_updates_list['nb_element_total'] = nb_element_total

enabled_updates_list = {
'updateid': [],
'title': [],
'kb': [],
'valided': [],
'missing': [],
'nb_element_total': nb_element_total,
}
session.commit()
session.flush()

Expand All @@ -397,7 +380,7 @@ def get_enabled_updates_list(self, session, entity, upd_list="gray", start=0, li
enabled_updates_list['missing'].append(list_b.missing)

except Exception as e:
logger.error("error function get_enabled_updates_list %s"%e)
logger.error(f"error function get_enabled_updates_list {e}")

return enabled_updates_list

Expand Down Expand Up @@ -484,7 +467,7 @@ def delete_rule(self, session, id):
SELECT xmppmaster.up_packages.updateid, xmppmaster.up_packages.kb, xmppmaster.up_packages.revisionid, xmppmaster.up_packages.title, xmppmaster.up_packages.updateid_package, xmppmaster.up_packages.payloadfiles FROM xmppmaster.up_packages
JOIN xmppmaster.up_black_list ON xmppmaster.up_packages.updateid = xmppmaster.up_black_list.updateid_or_kb or xmppmaster.up_packages.kb = xmppmaster.up_black_list.updateid_or_kb WHERE xmppmaster.up_black_list.id=%s;"""%(id)

sql="""DELETE FROM `xmppmaster`.`up_black_list` WHERE (`id` = '%s');"""%(id)
sql = f"""DELETE FROM `xmppmaster`.`up_black_list` WHERE (`id` = '{id}');"""
Comment on lines -487 to +470
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.delete_rule refactored with the following changes:


result = session.execute(sql_add)
result = session.execute(sql)
Expand All @@ -500,9 +483,6 @@ def delete_rule(self, session, id):
@DatabaseHelper._sessionm
def get_family_list(self, session, start, end, filter=""):
try:
family_list={ 'nb_element_total': 0,
'name_procedure' : []}

Comment on lines -503 to -505
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_family_list refactored with the following changes:

sql="""SELECT SQL_CALC_FOUND_ROWS
*
FROM
Expand All @@ -514,18 +494,17 @@ def get_family_list(self, session, start, end, filter=""):
filterwhere="""AND
name_procedure LIKE '%%%s%%'
LIMIT 5 OFFSET 5""" % filter
sql=sql+filterwhere
sql += filterwhere

sql+=";"

result = session.execute(sql)

sql_count = "SELECT FOUND_ROWS();"
ret_count = session.execute(sql_count)
nb_element_total = ret_count.first()[0]

family_list['nb_element_total'] = nb_element_total

family_list = {'name_procedure': [], 'nb_element_total': nb_element_total}
session.commit()
session.flush()

Expand Down Expand Up @@ -553,10 +532,7 @@ def get_count_machine_as_not_upd(self, session, updateid):
resultquery = session.execute(sql)
session.commit()
session.flush()
result= [{column: value for column,
value in rowproxy.items()}
for rowproxy in resultquery]
return result
return [dict(rowproxy.items()) for rowproxy in resultquery]
Comment on lines -556 to +535
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_count_machine_as_not_upd refactored with the following changes:



@DatabaseHelper._sessionm
Expand All @@ -577,14 +553,13 @@ def get_machines_needing_update(self, session, updateid):
session.flush()
result = []
if resultquery:
for row in resultquery:
result.append(row.hostname)
result.extend(row.hostname for row in resultquery)
Comment on lines -580 to +556
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.get_machines_needing_update refactored with the following changes:

return result


@DatabaseHelper._sessionm
def white_unlist_update(self, session, updateid):
sql = """DELETE FROM xmppmaster.up_white_list WHERE updateid = '%s' or kb='%s'"""%(updateid, updateid)
sql = f"""DELETE FROM xmppmaster.up_white_list WHERE updateid = '{updateid}' or kb='{updateid}'"""
Comment on lines -587 to +562
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function UpdatesDatabase.white_unlist_update refactored with the following changes:

try:
session.execute(sql)
session.commit()
Expand Down
Loading