Merge "Remove get_ip_version from ip_lib"
This commit is contained in:
commit
7ba0090d71
|
@ -17,7 +17,6 @@ import os
|
|||
import re
|
||||
import time
|
||||
|
||||
from debtcollector import removals
|
||||
import eventlet
|
||||
import netaddr
|
||||
from neutron_lib import constants
|
||||
|
@ -1173,14 +1172,6 @@ def add_namespace_to_cmd(cmd, namespace=None):
|
|||
return ['ip', 'netns', 'exec', namespace] + cmd if namespace else cmd
|
||||
|
||||
|
||||
@removals.remove(
|
||||
message="This will be removed in the future. "
|
||||
"Please use 'neutron.common.utils.get_ip_version' instead.",
|
||||
version='Pike', removal_version='Queens')
|
||||
def get_ip_version(ip_or_cidr):
|
||||
return common_utils.get_ip_version(ip_or_cidr)
|
||||
|
||||
|
||||
def get_ipv6_lladdr(mac_addr):
|
||||
return '%s/64' % netaddr.EUI(mac_addr).ipv6_link_local()
|
||||
|
||||
|
|
Loading…
Reference in New Issue