x/quark
Code Issues Proposed changes

RM8802

Browse Source 
Removes the deprecated form of security group creation in the driver
logic. At the time of implementation, quark only supported one type of
network at a time, so we could make assumptions about what our security
groups were going to look like for a given implementation. However,
since then we added multiple-driver support, meaning the old assumptions
were now invalid.

Confining these changes to their own patch will reduce the overall
complexity of the final security groups implementation. While this
removes functionality, said functionality was already broken, so this
isn't strictly "more" broken.

Ensures basic functionality still exists with creation and deletion of
groups and rules.
This commit is contained in:
Matt Dietz
2014-09-03 20:07:41 +00:00
parent 9e11f12bdf
commit 4fc87b03d6
3 changed files with 51 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
quark/plugin.py
View File

@@ -122,35 +122,25 @@ class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
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):
def create_security_group(self, context, security_group):
self._fix_missing_tenant_id(context, security_group["security_group"])
return security_groups.create_security_group(context, security_group,
net_driver)
return security_groups.create_security_group(context, security_group)
# 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,
security_group_rule, net_driver):
self._fix_missing_tenant_id(context, security_group["security_group"])
def create_security_group_rule(self, context, security_group_rule):
self._fix_missing_tenant_id(context,
security_group_rule["security_group_rule"])
return security_groups.create_security_group_rule(context,
security_group_rule,
net_driver)
security_group_rule)
# 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)
def delete_security_group(self, context, id):
security_groups.delete_security_group(context, id)
# 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)
def delete_security_group_rule(self, context, id):
security_groups.delete_security_group_rule(context, id)
@sessioned
def get_security_group(self, context, id, fields=None):
@@ -176,13 +166,10 @@ class Plugin(neutron_plugin_base_v2.NeutronPluginBaseV2,
fields, sorts, limit,
marker, page_reverse)
# 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):
def update_security_group(self, context, id, security_group):
return security_groups.update_security_group(context, id,
security_group,
net_driver)
security_group)
@sessioned
def create_ip_policy(self, context, ip_policy):