openstack
/
neutron
Code Issues Proposed changes

Merge "Neutron lib adoption"

This commit is contained in:
Jenkins 2016-11-22 08:37:24 +00:00 committed by Gerrit Code Review
parent 377a5c2362 f2fb460cf8
commit 50f31386cf
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
neutron/common/utils.py
View File

@ -80,18 +80,14 @@ def subprocess_popen(args, stdin=None, stdout=None, stderr=None, shell=False,
@removals.remove( @removals.remove(
message="Use parse_mappings from neutron_lib.utils.helpers", message="Use parse_mappings from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def parse_mappings(mapping_list, unique_values=True, unique_keys=True): def parse_mappings(mapping_list, unique_values=True, unique_keys=True):
return helpers.parse_mappings(mapping_list, unique_values=unique_values, return helpers.parse_mappings(mapping_list, unique_values=unique_values,
unique_keys=unique_keys) unique_keys=unique_keys)
@removals.remove( @removals.remove(
message="Use get_hostname from neutron_lib.utils.net", message="Use get_hostname from neutron_lib.utils.net")
version="Ocata",
removal_version="Pike")
def get_hostname(): def get_hostname():
return net.get_hostname() return net.get_hostname()
@ -101,49 +97,37 @@ def get_first_host_ip(net, ip_version):
@removals.remove( @removals.remove(
message="Use compare_elements from neutron_lib.utils.helpers", message="Use compare_elements from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def compare_elements(a, b): def compare_elements(a, b):
return helpers.compare_elements(a, b) return helpers.compare_elements(a, b)
@removals.remove( @removals.remove(
message="Use safe_sort_key from neutron_lib.utils.helpers", message="Use safe_sort_key from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def safe_sort_key(value): def safe_sort_key(value):
return helpers.safe_sort_key(value) return helpers.safe_sort_key(value)
@removals.remove( @removals.remove(
message="Use dict2str from neutron_lib.utils.helpers", message="Use dict2str from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def dict2str(dic): def dict2str(dic):
return helpers.dict2str(dic) return helpers.dict2str(dic)
@removals.remove( @removals.remove(
message="Use str2dict from neutron_lib.utils.helpers", message="Use str2dict from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def str2dict(string): def str2dict(string):
return helpers.str2dict(string) return helpers.str2dict(string)
@removals.remove( @removals.remove(
message="Use dict2tuple from neutron_lib.utils.helpers", message="Use dict2tuple from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def dict2tuple(d): def dict2tuple(d):
return helpers.dict2tuple(d) return helpers.dict2tuple(d)
@removals.remove( @removals.remove(
message="Use diff_list_of_dict from neutron_lib.utils.helpers", message="Use diff_list_of_dict from neutron_lib.utils.helpers")
version="Ocata",
removal_version="Pike")
def diff_list_of_dict(old_list, new_list): def diff_list_of_dict(old_list, new_list):
return helpers.diff_list_of_dict(old_list, new_list) return helpers.diff_list_of_dict(old_list, new_list)
@ -182,9 +166,7 @@ def get_dhcp_agent_device_id(network_id, host):
@removals.remove( @removals.remove(
message="Use cpu_count from neutron_lib.utils.host", message="Use cpu_count from neutron_lib.utils.host")
version="Ocata",
removal_version="Pike")
def cpu_count(): def cpu_count():
return host.cpu_count() return host.cpu_count()