diff options
author | Manuel Buil <mbuil@suse.com> | 2017-03-31 12:39:03 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-03-31 12:39:03 +0000 |
commit | f3f681af057352f26c7447009b0a9cdc144fac5c (patch) | |
tree | 4c9af2a228d0ffc661c7b41c5e6577458bd91262 /sfc/lib/topology_shuffler.py | |
parent | e61239dbb4f96bb4b798cd3c6e6d6c953d4fcee4 (diff) | |
parent | 4afb88fb03f4b9280470e53322d5a630d22548f5 (diff) |
Merge "Fix hardcoded domain in wait_for_clf_rules"
Diffstat (limited to 'sfc/lib/topology_shuffler.py')
-rw-r--r-- | sfc/lib/topology_shuffler.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py index 4e027d9e..9104a5f6 100644 --- a/sfc/lib/topology_shuffler.py +++ b/sfc/lib/topology_shuffler.py @@ -1,8 +1,7 @@ import datetime import random -import functest.utils.openstack_utils as os_utils import functest.utils.functest_logger as ft_logger - +import sfc.lib.utils as sfc_utils logger = ft_logger.Logger(__name__).getLogger() @@ -75,15 +74,6 @@ def get_seed(): return seed -def _get_av_zones(): - ''' - Return the availability zone each host belongs to - ''' - nova_client = os_utils.get_nova_client() - hosts = os_utils.get_hypervisors(nova_client) - return ['nova::{0}'.format(host) for host in hosts] - - def topology(vnf_names, av_zones=None, seed=None): ''' Get the topology for client, server and vnfs. @@ -99,7 +89,7 @@ def topology(vnf_names, av_zones=None, seed=None): ''' if av_zones is None: - av_zones = _get_av_zones() + av_zones = sfc_utils.get_av_zones() if len(av_zones) < 2 or seed is None: # fall back to nova availability zone |