Merge "Remove netaddr from requirements"
This commit is contained in:
commit
286a5db4cf
|
@ -58,7 +58,6 @@ monotonic==1.4
|
||||||
mox3==0.25.0
|
mox3==0.25.0
|
||||||
msgpack==0.5.6
|
msgpack==0.5.6
|
||||||
munch==2.2.0
|
munch==2.2.0
|
||||||
netaddr==0.7.18
|
|
||||||
netifaces==0.10.6
|
netifaces==0.10.6
|
||||||
neutron-lib==1.13.0
|
neutron-lib==1.13.0
|
||||||
numpy==1.14.2
|
numpy==1.14.2
|
||||||
|
|
|
@ -32,7 +32,6 @@ six>=1.10.0 # MIT
|
||||||
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
|
||||||
stevedore>=1.20.0 # Apache-2.0
|
stevedore>=1.20.0 # Apache-2.0
|
||||||
docker>=2.4.2 # Apache-2.0
|
docker>=2.4.2 # Apache-2.0
|
||||||
netaddr>=0.7.18 # BSD
|
|
||||||
neutron-lib>=1.13.0 # Apache-2.0
|
neutron-lib>=1.13.0 # Apache-2.0
|
||||||
websockify>=0.8.0 # LGPLv3
|
websockify>=0.8.0 # LGPLv3
|
||||||
websocket-client>=0.44.0 # LGPLv2+
|
websocket-client>=0.44.0 # LGPLv2+
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
"""Zun common internal object model"""
|
"""Zun common internal object model"""
|
||||||
|
|
||||||
import netaddr
|
|
||||||
|
|
||||||
from oslo_versionedobjects import base as ovoo_base
|
from oslo_versionedobjects import base as ovoo_base
|
||||||
from oslo_versionedobjects import fields as ovoo_fields
|
from oslo_versionedobjects import fields as ovoo_fields
|
||||||
|
|
||||||
|
@ -94,10 +92,6 @@ def obj_to_primitive(obj):
|
||||||
if obj.obj_attr_is_set(key) or key in obj.obj_extra_fields:
|
if obj.obj_attr_is_set(key) or key in obj.obj_extra_fields:
|
||||||
result[key] = obj_to_primitive(getattr(obj, key))
|
result[key] = obj_to_primitive(getattr(obj, key))
|
||||||
return result
|
return result
|
||||||
elif isinstance(obj, netaddr.IPAddress):
|
|
||||||
return str(obj)
|
|
||||||
elif isinstance(obj, netaddr.IPNetwork):
|
|
||||||
return str(obj)
|
|
||||||
else:
|
else:
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue