openstack
/
neutron
Code Issues Proposed changes

Merge "Log message when legacy IPv6 ICMP protocol name used in SG rule"

This commit is contained in:
Zuul 2019-06-15 12:36:43 +00:00 committed by Gerrit Code Review
parent 1f14290ca5 4fd104b9dd
commit 90c975292b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/db/securitygroups_db.py
View File

@ -28,6 +28,7 @@ from neutron_lib.db import utils as db_utils
from neutron_lib import exceptions as n_exc
from neutron_lib.utils import helpers
from neutron_lib.utils import net
from oslo_log import log as logging
from oslo_utils import uuidutils
import six
from sqlalchemy.orm import scoped_session
@ -43,6 +44,9 @@ from neutron.objects import ports as port_obj
from neutron.objects import securitygroup as sg_obj
LOG = logging.getLogger(__name__)
@resource_extend.has_resource_extenders
@registry.has_registry_receivers
class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase,
@ -550,6 +554,13 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase,
if (rule.get('ethertype') == constants.IPv6 and
rule.get('protocol') in const.IPV6_ICMP_LEGACY_PROTO_LIST):
rule['protocol'] = constants.PROTO_NAME_IPV6_ICMP
LOG.info('Project %(project)s added a security group rule with '
'legacy IPv6 ICMP protocol name %(protocol)s, '
'%(new_protocol)s should be used instead. It was '
'automatically converted.',
{'project': rule['tenant_id'],
'protocol': rule['protocol'],
'new_protocol': constants.PROTO_NAME_IPV6_ICMP})
def _validate_security_group_rule(self, context, security_group_rule):
rule = security_group_rule['security_group_rule']