consume is_bsd from neutron-lib
The test tool function is_bsd() lives in neutron-lib. This patch removes the function from neutron and uses it from neutron-lib instead. NeutronLibImpact Change-Id: Ib48f7f1c89e215e9e94d62de31776c492f810f54
This commit is contained in:
parent
590002728d
commit
7a285a7fcc
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
import platform
|
|
||||||
import random
|
import random
|
||||||
import time
|
import time
|
||||||
import warnings
|
import warnings
|
||||||
|
@ -334,17 +333,6 @@ def get_random_network_segment_range_network_type():
|
||||||
constants.TYPE_GENEVE])
|
constants.TYPE_GENEVE])
|
||||||
|
|
||||||
|
|
||||||
def is_bsd():
|
|
||||||
"""Return True on BSD-based systems."""
|
|
||||||
|
|
||||||
system = platform.system()
|
|
||||||
if system == 'Darwin':
|
|
||||||
return True
|
|
||||||
if 'bsd' in system.lower():
|
|
||||||
return True
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def reset_random_seed():
|
def reset_random_seed():
|
||||||
# reset random seed to make sure other processes extracting values from RNG
|
# reset random seed to make sure other processes extracting values from RNG
|
||||||
# don't get the same results (useful especially when you then use the
|
# don't get the same results (useful especially when you then use the
|
||||||
|
|
|
@ -30,6 +30,7 @@ from neutron_lib.db import api as db_api
|
||||||
from neutron_lib import exceptions as lib_exc
|
from neutron_lib import exceptions as lib_exc
|
||||||
from neutron_lib import fixture
|
from neutron_lib import fixture
|
||||||
from neutron_lib.plugins import directory
|
from neutron_lib.plugins import directory
|
||||||
|
from neutron_lib.tests import tools
|
||||||
from neutron_lib.utils import helpers
|
from neutron_lib.utils import helpers
|
||||||
from neutron_lib.utils import net
|
from neutron_lib.utils import net
|
||||||
from oslo_concurrency import lockutils
|
from oslo_concurrency import lockutils
|
||||||
|
@ -63,7 +64,6 @@ from neutron.objects import router as l3_obj
|
||||||
from neutron.plugins.ml2.common import exceptions as ml2_exceptions
|
from neutron.plugins.ml2.common import exceptions as ml2_exceptions
|
||||||
from neutron import policy
|
from neutron import policy
|
||||||
from neutron.tests import base
|
from neutron.tests import base
|
||||||
from neutron.tests import tools
|
|
||||||
from neutron.tests.unit.api import test_extensions
|
from neutron.tests.unit.api import test_extensions
|
||||||
from neutron.tests.unit import testlib_api
|
from neutron.tests.unit import testlib_api
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue