openstack/monasca-api
Code Issues Proposed changes

Remove redundant code

Browse Source 
It is impossible to execute this code because
old_sub_alarm_defs_by_id value is always empty dict.

Change-Id: Id0ae84c4bc96a18185db1e825cd11c7d2e88d2b1
This commit is contained in:
Adrian Czarnecki
2019-01-24 11:22:49 +01:00
parent 6f09a6f49a
commit 55a172c072
2 changed files with 4 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
monasca_api/common/repositories/sqla/alarm_definitions_repository.py
View File

@@ -584,15 +584,6 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository,
b_updated_at=now, b_updated_at=now,
b_tenant_id=tenant_id, b_tenant_id=tenant_id,
b_id=alarm_definition_id) b_id=alarm_definition_id)
parms = []
for sub_alarm_def_id in old_sub_alarm_defs_by_id.values():
parms.append({'b_id': sub_alarm_def_id.id})
if len(parms) > 0:
query = self.update_or_patch_alarm_definition_delete_sad_query
conn.execute(query, parms)
parms = [] parms = []
for sub_alarm_definition_id, sub_alarm_def in ( for sub_alarm_definition_id, sub_alarm_def in (
changed_sub_alarm_defs_by_id.items()): changed_sub_alarm_defs_by_id.items()):
@@ -605,48 +596,6 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository,
query = self.update_or_patch_alarm_definition_update_sad_query query = self.update_or_patch_alarm_definition_update_sad_query
conn.execute(query, parms) conn.execute(query, parms)
parms = []
parms_sadd = []
for sub_alarm_def in new_sub_alarm_defs_by_id.values():
adi = sub_alarm_def.alarm_definition_id
function = sub_alarm_def.function.encode('utf8') if six.PY2 \
else sub_alarm_def.function
metric_name = sub_alarm_def.metric_name.encode('utf8') if six.PY2 \
else sub_alarm_def.metric_name
operator = sub_alarm_def.operator.encode('utf8') if six.PY2 \
else sub_alarm_def.operator
threshold = sub_alarm_def.threshold
period = sub_alarm_def.period
periods = sub_alarm_def.periods
is_deterministic = sub_alarm_def.is_deterministic
parms.append({'b_id': sub_alarm_def.id,
'b_alarm_definition_id': adi,
'b_function': function,
'b_metric_name': metric_name,
'b_operator': operator,
'b_threshold': threshold,
'b_period': period,
'b_periods': periods,
'b_is_deterministic': is_deterministic,
'b_created_at': now,
'b_updated_at': now})
for name, value in sub_alarm_def.dimensions.items():
sadi = sub_alarm_def.id
b_dimension_name = name .encode('utf8') if six.PY2 else name
b_value = value.encode('utf8') if six.PY2 else value
parms_sadd.append({'b_sub_alarm_definition_id': sadi,
'b_dimension_name': b_dimension_name,
'b_value': b_value})
if len(parms) > 0:
query = self.update_or_patch_alarm_definition_insert_sad_query
conn.execute(query, parms)
if len(parms_sadd) > 0:
query = self.update_or_patch_alarm_definition_insert_sadd_query
conn.execute(query, parms_sadd)
# Delete old alarm actions # Delete old alarm actions
if patch: if patch:
if alarm_actions is not None: if alarm_actions is not None:

9
monasca_api/common/repositories/sqla/alarms_repository.py
View File

@@ -433,11 +433,10 @@ class AlarmsRepository(sql_repository.SQLRepository,
order_column = columns_mapper.get(col_name, literal_column(col_name)) order_column = columns_mapper.get(col_name, literal_column(col_name))
if len(col_values) > 1: if len(col_values) > 1:
mode = col_values[1] mode = col_values[1]
if mode: if mode == 'asc':
if mode == 'asc': order_column = asc(order_column)
order_column = asc(order_column) elif mode == 'desc':
elif mode == 'desc': order_column = desc(order_column)
order_column = desc(order_column)
order_columns.append(order_column) order_columns.append(order_column)
received_cols[col_name] = True received_cols[col_name] = True
return order_columns, received_cols return order_columns, received_cols