Remove the unnecessary dependency to netaddr

Since no one is directly using netaddr, remove that dependency.

Change-Id: Ia713af8b98043df0ebfd8e76046dc080dac413a3
This commit is contained in:
Lianhao Lu
2015-03-27 15:48:23 +08:00
parent e14a4edc81
commit 33a80ea0f1
3 changed files with 2 additions and 4 deletions

View File

@@ -16,9 +16,9 @@
import socket
import msgpack
import netaddr
import oslo.messaging
from oslo_config import cfg
from oslo_utils import netutils
from oslo_utils import timeutils
from oslo_utils import units
@@ -109,7 +109,7 @@ class CollectorService(os_service.Service):
def start_udp(self):
address_family = socket.AF_INET
if netaddr.valid_ipv6(cfg.CONF.collector.udp_address):
if netutils.is_valid_ipv6(cfg.CONF.collector.udp_address):
address_family = socket.AF_INET6
udp = socket.socket(address_family, socket.SOCK_DGRAM)
udp.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

View File

@@ -11,7 +11,6 @@ jsonpath-rw>=1.2.0,<2.0
jsonschema>=2.0.0,<3.0.0
lxml>=2.3
msgpack-python>=0.4.0
netaddr>=0.7.12
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
oslo.context>=0.2.0,<0.3.0 # Apache-2.0

View File

@@ -13,7 +13,6 @@ kafka-python>=0.9.2
keystonemiddleware>=1.5.0
lxml>=2.3
msgpack-python>=0.4.0
netaddr>=0.7.12
oslo.context>=0.2.0,<0.3.0 # Apache-2.0
oslo.db>=1.7.0,<1.8.0 # Apache-2.0
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0