openstack/neutron
Code Issues Proposed changes

Remove neutron lib warnings from ipv6_utils

Browse Source 
Removes:

    neutron/common/ipv6_utils.py:70: DeprecationWarning: IPV6_SLAAC in version
    'mitaka' and will be removed in version 'newton': moved to neutron_lib.constants

Same for DHCPV6_STATELESS

TrivialFix

This also bumps the neutron-lib version following the commit above.

Depends-On: 06d11930aded9c73ab9539d1730e3eb8655730a9
Change-Id: I174a99c9e2c126ac910b017342010d988ac2abdc
Closes-bug: #1608224
This commit is contained in:
Gary Kotton
2016-07-31 05:28:37 -07:00
committed by garyk
parent ff5b38071e
commit 38f1ec03f9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/common/ipv6_utils.py
View File

@@ -23,7 +23,6 @@ from neutron_lib import constants as const
from oslo_log import log from oslo_log import log
from neutron._i18n import _, _LI from neutron._i18n import _, _LI
from neutron.common import constants
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@@ -67,7 +66,7 @@ def is_enabled():
def is_auto_address_subnet(subnet): def is_auto_address_subnet(subnet):
"""Check if subnet is an auto address subnet.""" """Check if subnet is an auto address subnet."""
modes = [constants.IPV6_SLAAC, constants.DHCPV6_STATELESS] modes = [const.IPV6_SLAAC, const.DHCPV6_STATELESS]
return (subnet['ipv6_address_mode'] in modes return (subnet['ipv6_address_mode'] in modes
or subnet['ipv6_ra_mode'] in modes) or subnet['ipv6_ra_mode'] in modes)

2
requirements.txt
View File

@@ -17,7 +17,7 @@ Jinja2>=2.8 # BSD License (3 clause)
keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0 keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
netaddr!=0.7.16,>=0.7.12 # BSD netaddr!=0.7.16,>=0.7.12 # BSD
netifaces>=0.10.4 # MIT netifaces>=0.10.4 # MIT
neutron-lib>=0.2.0 # Apache-2.0 neutron-lib>=0.3.0 # Apache-2.0
python-neutronclient>=4.2.0 # Apache-2.0 python-neutronclient>=4.2.0 # Apache-2.0
retrying!=1.3.0,>=1.2.3 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0
ryu!=4.1,!=4.2,!=4.2.1,!=4.4,>=3.30 # Apache-2.0 ryu!=4.1,!=4.2,!=4.2.1,!=4.4,>=3.30 # Apache-2.0