Merge "Pass context as kwarg instead of positional arg to get_engine"
This commit is contained in:
commit
90f01d5ebb
@ -630,7 +630,7 @@ def _compute_node_select(context, filters=None, limit=None, marker=None):
|
|||||||
|
|
||||||
def _compute_node_fetchall(context, filters=None, limit=None, marker=None):
|
def _compute_node_fetchall(context, filters=None, limit=None, marker=None):
|
||||||
select = _compute_node_select(context, filters, limit=limit, marker=marker)
|
select = _compute_node_select(context, filters, limit=limit, marker=marker)
|
||||||
engine = get_engine(context)
|
engine = get_engine(context=context)
|
||||||
conn = engine.connect()
|
conn = engine.connect()
|
||||||
|
|
||||||
results = conn.execute(select).fetchall()
|
results = conn.execute(select).fetchall()
|
||||||
@ -748,7 +748,7 @@ def compute_node_delete(context, compute_id):
|
|||||||
@pick_context_manager_reader
|
@pick_context_manager_reader
|
||||||
def compute_node_statistics(context):
|
def compute_node_statistics(context):
|
||||||
"""Compute statistics over all compute nodes."""
|
"""Compute statistics over all compute nodes."""
|
||||||
engine = get_engine(context)
|
engine = get_engine(context=context)
|
||||||
services_tbl = models.Service.__table__
|
services_tbl = models.Service.__table__
|
||||||
|
|
||||||
inner_sel = sa.alias(_compute_node_select(context), name='inner_sel')
|
inner_sel = sa.alias(_compute_node_select(context), name='inner_sel')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user