openstack/nova
Code Issues Proposed changes

Merge "enginefacade: 'provider_fw', 'console_pool' and 'console'"

Browse Source
This commit is contained in:
Jenkins
2016-02-03 17:49:57 +00:00
committed by Gerrit Code Review
parent 26505db185 1c8a9baf1d
commit a2324c0592
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
nova/db/sqlalchemy/api.py
View File

@@ -4410,23 +4410,24 @@ def security_group_default_rule_list(context):
################### ###################
@main_context_manager.writer
def provider_fw_rule_create(context, rule): def provider_fw_rule_create(context, rule):
fw_rule_ref = models.ProviderFirewallRule() fw_rule_ref = models.ProviderFirewallRule()
fw_rule_ref.update(rule) fw_rule_ref.update(rule)
fw_rule_ref.save() fw_rule_ref.save(context.session)
return fw_rule_ref return fw_rule_ref
@main_context_manager.reader
def provider_fw_rule_get_all(context): def provider_fw_rule_get_all(context):
return model_query(context, models.ProviderFirewallRule).all() return model_query(context, models.ProviderFirewallRule).all()
@main_context_manager.writer
def provider_fw_rule_destroy(context, rule_id): def provider_fw_rule_destroy(context, rule_id):
session = get_session() context.session.query(models.ProviderFirewallRule).\
with session.begin(): filter_by(id=rule_id).\
session.query(models.ProviderFirewallRule).\ soft_delete()
filter_by(id=rule_id).\
soft_delete()
################### ###################
@@ -4548,11 +4549,12 @@ def migration_get_all_by_filters(context, filters):
################## ##################
@main_context_manager.writer
def console_pool_create(context, values): def console_pool_create(context, values):
pool = models.ConsolePool() pool = models.ConsolePool()
pool.update(values) pool.update(values)
try: try:
pool.save() pool.save(context.session)
except db_exc.DBDuplicateEntry: except db_exc.DBDuplicateEntry:
raise exception.ConsolePoolExists( raise exception.ConsolePoolExists(
host=values["host"], host=values["host"],
@@ -4562,6 +4564,7 @@ def console_pool_create(context, values):
return pool return pool
@main_context_manager.reader
def console_pool_get_by_host_type(context, compute_host, host, def console_pool_get_by_host_type(context, compute_host, host,
console_type): console_type):
@@ -4580,6 +4583,7 @@ def console_pool_get_by_host_type(context, compute_host, host,
return result return result
@main_context_manager.reader
def console_pool_get_all_by_host_type(context, host, console_type): def console_pool_get_all_by_host_type(context, host, console_type):
return model_query(context, models.ConsolePool, read_deleted="no").\ return model_query(context, models.ConsolePool, read_deleted="no").\
filter_by(host=host).\ filter_by(host=host).\
@@ -4588,22 +4592,26 @@ def console_pool_get_all_by_host_type(context, host, console_type):
all() all()
##################
@main_context_manager.writer
def console_create(context, values): def console_create(context, values):
console = models.Console() console = models.Console()
console.update(values) console.update(values)
console.save() console.save(context.session)
return console return console
@main_context_manager.writer
def console_delete(context, console_id): def console_delete(context, console_id):
session = get_session() # NOTE(mdragon): consoles are meant to be transient.
with session.begin(): context.session.query(models.Console).\
# NOTE(mdragon): consoles are meant to be transient. filter_by(id=console_id).\
session.query(models.Console).\ delete()
filter_by(id=console_id).\
delete()
@main_context_manager.reader
def console_get_by_pool_instance(context, pool_id, instance_uuid): def console_get_by_pool_instance(context, pool_id, instance_uuid):
result = model_query(context, models.Console, read_deleted="yes").\ result = model_query(context, models.Console, read_deleted="yes").\
filter_by(pool_id=pool_id).\ filter_by(pool_id=pool_id).\
@@ -4618,6 +4626,7 @@ def console_get_by_pool_instance(context, pool_id, instance_uuid):
return result return result
@main_context_manager.reader
def console_get_all_by_instance(context, instance_uuid, columns_to_join=None): def console_get_all_by_instance(context, instance_uuid, columns_to_join=None):
query = model_query(context, models.Console, read_deleted="yes").\ query = model_query(context, models.Console, read_deleted="yes").\
filter_by(instance_uuid=instance_uuid) filter_by(instance_uuid=instance_uuid)
@@ -4627,6 +4636,7 @@ def console_get_all_by_instance(context, instance_uuid, columns_to_join=None):
return query.all() return query.all()
@main_context_manager.reader
def console_get(context, console_id, instance_uuid=None): def console_get(context, console_id, instance_uuid=None):
query = model_query(context, models.Console, read_deleted="yes").\ query = model_query(context, models.Console, read_deleted="yes").\
filter_by(id=console_id).\ filter_by(id=console_id).\