openstack/nova
Code Issues Proposed changes

Merge "wrap_check_security_groups_policy is already defined"

Browse Source
This commit is contained in:
Jenkins
2014-05-01 17:21:46 +00:00
committed by Gerrit Code Review
parent 0e479b516c 1f672431f9
commit bef55b21ad
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/network/security_group/neutron_driver.py
View File

@@ -33,9 +33,6 @@ from nova.openstack.common import uuidutils
from nova import utils from nova import utils
wrap_check_security_groups_policy = compute_api.policy_decorator(
scope='compute:security_groups')
CONF = cfg.CONF CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -389,7 +386,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
return port_security_enabled return port_security_enabled
return False return False
@wrap_check_security_groups_policy @compute_api.wrap_check_security_groups_policy
def add_to_instance(self, context, instance, security_group_name): def add_to_instance(self, context, instance, security_group_name):
"""Add security group to the instance.""" """Add security group to the instance."""
@@ -443,7 +440,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.exception(_("Neutron Error:")) LOG.exception(_("Neutron Error:"))
@wrap_check_security_groups_policy @compute_api.wrap_check_security_groups_policy
def remove_from_instance(self, context, instance, security_group_name): def remove_from_instance(self, context, instance, security_group_name):
"""Remove the security group associated with the instance.""" """Remove the security group associated with the instance."""
neutron = neutronv2.get_client(context) neutron = neutronv2.get_client(context)