Fixes #19
Wraps all session using plugin calls in a decorator that automatically closes the session and resets the context session state to None.
This commit is contained in:
Matt Dietz
@@ -67,6 +67,18 @@ CONF.register_opts(quark_quota_opts, "QUOTAS")
|
||||
quota.QUOTAS.register_resources(quark_resources)
|
||||
|
||||
|
||||
def sessioned(func):
|
||||
def _wrapped(self, context, *args, **kwargs):
|
||||
res = func(self, context, *args, **kwargs)
|
||||
context.session.close()
|
||||
|
||||
#NOTE(mdietz): Forces neutron to get a fresh session
|
||||
# if it needs it after our call
|
||||
context._session = None
|
||||
return res
|
||||
return _wrapped
|
||||
|
||||
|
||||
class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
|
||||
sg_ext.SecurityGroupPluginBase):
|
||||
supported_extension_aliases = ["mac_address_ranges", "routes",
|
||||
@@ -80,26 +92,32 @@ class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
|
||||
neutron_db_api.configure_db()
|
||||
neutron_db_api.register_models(base=models.BASEV2)
|
||||
|
||||
@sessioned
|
||||
def get_mac_address_range(self, context, id, fields=None):
|
||||
return mac_address_ranges.get_mac_address_range(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def get_mac_address_ranges(self, context):
|
||||
return mac_address_ranges.get_mac_address_ranges(context)
|
||||
|
||||
@sessioned
|
||||
def create_mac_address_range(self, context, mac_range):
|
||||
return mac_address_ranges.create_mac_address_range(context, mac_range)
|
||||
|
||||
@sessioned
|
||||
def delete_mac_address_range(self, context, id):
|
||||
mac_address_ranges.delete_mac_address_range(context, id)
|
||||
|
||||
#TODO(dietz/perkins): passing in net_driver as a stopgap,
|
||||
#XXX DO NOT DEPLOY!! XXX see redmine #2487
|
||||
@sessioned
|
||||
def create_security_group(self, context, security_group, net_driver):
|
||||
return security_groups.create_security_group(context, security_group,
|
||||
net_driver)
|
||||
|
||||
#TODO(dietz/perkins): passing in net_driver as a stopgap,
|
||||
#XXX DO NOT DEPLOY!! XXX see redmine #2487
|
||||
@sessioned
|
||||
def create_security_group_rule(self, context, security_group_rule,
|
||||
net_driver):
|
||||
return security_groups.create_security_group_rule(context,
|
||||
@@ -108,20 +126,25 @@ class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
|
||||
|
||||
#TODO(dietz/perkins): passing in net_driver as a stopgap,
|
||||
#XXX DO NOT DEPLOY!! XXX see redmine #2487
|
||||
@sessioned
|
||||
def delete_security_group(self, context, id, net_driver):
|
||||
security_groups.delete_security_group(context, id, net_driver)
|
||||
|
||||
#TODO(dietz/perkins): passing in net_driver as a stopgap,
|
||||
#XXX DO NOT DEPLOY!! XXX see redmine #2487
|
||||
@sessioned
|
||||
def delete_security_group_rule(self, context, id, net_driver):
|
||||
security_groups.delete_security_group_rule(context, id, net_driver)
|
||||
|
||||
@sessioned
|
||||
def get_security_group(self, context, id, fields=None):
|
||||
return security_groups.get_security_group(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def get_security_group_rule(self, context, id, fields=None):
|
||||
return security_groups.get_security_group_rule(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def get_security_groups(self, context, filters=None, fields=None,
|
||||
sorts=None, limit=None, marker=None,
|
||||
page_reverse=False):
|
||||
@@ -129,6 +152,7 @@ class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
|
||||
sorts, limit, marker,
|
||||
page_reverse)
|
||||
|
||||
@sessioned
|
||||
def get_security_group_rules(self, context, filters=None, fields=None,
|
||||
sorts=None, limit=None, marker=None,
|
||||
page_reverse=False):
|
||||
@@ -138,115 +162,152 @@ class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
|
||||
|
||||
#TODO(dietz/perkins): passing in net_driver as a stopgap,
|
||||
#XXX DO NOT DEPLOY!! XXX see redmine #2487
|
||||
@sessioned
|
||||
def update_security_group(self, context, id, security_group, net_driver):
|
||||
return security_groups.update_security_group(context, id,
|
||||
security_group,
|
||||
net_driver)
|
||||
|
||||
@sessioned
|
||||
def create_ip_policy(self, context, ip_policy):
|
||||
return ip_policies.create_ip_policy(context, ip_policy)
|
||||
|
||||
@sessioned
|
||||
def get_ip_policy(self, context, id):
|
||||
return ip_policies.get_ip_policy(context, id)
|
||||
|
||||
@sessioned
|
||||
def get_ip_policies(self, context, **filters):
|
||||
return ip_policies.get_ip_policies(context, **filters)
|
||||
|
||||
@sessioned
|
||||
def update_ip_policy(self, context, id, ip_policy):
|
||||
return ip_policies.update_ip_policy(context, id, ip_policy)
|
||||
|
||||
@sessioned
|
||||
def delete_ip_policy(self, context, id):
|
||||
return ip_policies.delete_ip_policy(context, id)
|
||||
|
||||
@sessioned
|
||||
def get_ip_addresses(self, context, **filters):
|
||||
return ip_addresses.get_ip_addresses(context, **filters)
|
||||
|
||||
@sessioned
|
||||
def get_ip_address(self, context, id):
|
||||
return ip_addresses.get_ip_address(context, id)
|
||||
|
||||
@sessioned
|
||||
def create_ip_address(self, context, ip_address):
|
||||
return ip_addresses.create_ip_address(context, ip_address)
|
||||
|
||||
@sessioned
|
||||
def update_ip_address(self, context, id, ip_address):
|
||||
return ip_addresses.update_ip_address(context, id, ip_address)
|
||||
|
||||
@sessioned
|
||||
def create_port(self, context, port):
|
||||
return ports.create_port(context, port)
|
||||
|
||||
@sessioned
|
||||
def post_update_port(self, context, id, port):
|
||||
return ports.post_update_port(context, id, port)
|
||||
|
||||
@sessioned
|
||||
def get_port(self, context, id, fields=None):
|
||||
return ports.get_port(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def update_port(self, context, id, port):
|
||||
return ports.update_port(context, id, port)
|
||||
|
||||
@sessioned
|
||||
def get_ports(self, context, filters=None, fields=None):
|
||||
return ports.get_ports(context, filters, fields)
|
||||
|
||||
@sessioned
|
||||
def get_ports_count(self, context, filters=None):
|
||||
return ports.get_ports_count(context, filters)
|
||||
|
||||
@sessioned
|
||||
def delete_port(self, context, id):
|
||||
return ports.delete_port(context, id)
|
||||
|
||||
@sessioned
|
||||
def disassociate_port(self, context, id, ip_address_id):
|
||||
return ports.disassociate_port(context, id, ip_address_id)
|
||||
|
||||
@sessioned
|
||||
def diagnose_port(self, context, id, fields):
|
||||
return ports.diagnose_port(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def get_route(self, context, id):
|
||||
return routes.get_route(context, id)
|
||||
|
||||
@sessioned
|
||||
def get_routes(self, context):
|
||||
return routes.get_routes(context)
|
||||
|
||||
@sessioned
|
||||
def create_route(self, context, route):
|
||||
return routes.create_route(context, route)
|
||||
|
||||
@sessioned
|
||||
def delete_route(self, context, id):
|
||||
routes.delete_route(context, id)
|
||||
|
||||
@sessioned
|
||||
def create_subnet(self, context, subnet):
|
||||
return subnets.create_subnet(context, subnet)
|
||||
|
||||
@sessioned
|
||||
def update_subnet(self, context, id, subnet):
|
||||
return subnets.update_subnet(context, id, subnet)
|
||||
|
||||
@sessioned
|
||||
def get_subnet(self, context, id, fields=None):
|
||||
return subnets.get_subnet(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def get_subnets(self, context, filters=None, fields=None):
|
||||
return subnets.get_subnets(context, filters, fields)
|
||||
|
||||
@sessioned
|
||||
def get_subnets_count(self, context, filters=None):
|
||||
return subnets.get_subnets_count(context, filters)
|
||||
|
||||
@sessioned
|
||||
def delete_subnet(self, context, id):
|
||||
return subnets.delete_subnet(context, id)
|
||||
|
||||
@sessioned
|
||||
def diagnose_subnet(self, context, id, fields):
|
||||
return subnets.diagnose_subnet(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def create_network(self, context, network):
|
||||
return networks.create_network(context, network)
|
||||
|
||||
@sessioned
|
||||
def update_network(self, context, id, network):
|
||||
return networks.update_network(context, id, network)
|
||||
|
||||
@sessioned
|
||||
def get_network(self, context, id, fields=None):
|
||||
return networks.get_network(context, id, fields)
|
||||
|
||||
@sessioned
|
||||
def get_networks(self, context, filters=None, fields=None):
|
||||
return networks.get_networks(context, filters, fields)
|
||||
|
||||
@sessioned
|
||||
def get_networks_count(self, context, filters=None):
|
||||
return networks.get_networks_count(context, filters)
|
||||
|
||||
@sessioned
|
||||
def delete_network(self, context, id):
|
||||
return networks.delete_network(context, id)
|
||||
|
||||
@sessioned
|
||||
def diagnose_network(self, context, id, fields):
|
||||
return networks.diagnose_network(context, id, fields)
|
||||
|
||||
Reference in New Issue
Block a user